Index: session.scm
==================================================================
--- session.scm
+++ session.scm
@@ -52,10 +52,11 @@
    session-cookie
    curr-err
    log-port
    logfile
    seen-pages
+   page-dir-style
    debugmode))
 
 ;; SPLIT INTO STRAIGHT FORWARD INIT AND COMPLEX INIT
 (define-method (initialize (self <session>) initargs)
   (call-next-method)
@@ -73,10 +74,12 @@
   (slot-set! self 'sroot       "./")
   (slot-set! self 'session-cookie #f)
   (slot-set! self 'curr-err #f)
   (slot-set! self 'log-port (current-error-port))
   (slot-set! self 'seen-pages '())
+  (slot-set! self 'page-dir-style 'oldstyle) ;; onedir:        pages/<pagename>_(view|control).scm
+                                             ;; anything else: pages/<pagename>/(view|control).scm 
   (slot-set! self 'debugmode #f)
   (for-each (lambda (slot-name)
               (slot-set! self slot-name (make-hash-table)))
             (list 'pagevars 'sessionvars 'globalvars 'pagevars-before 
 		  'sessionvars-before 'globalvars-before))
@@ -490,21 +493,32 @@
 	       (res '()))
       (if (eof-object? hed)
 	  res
 	  (loop (read-line p)(append res (list hed)))))))
 
+;; May 2011, putting all pages into one directory for the following reasons:
+;;   1. want filename to reflect page name (emacs limitation)
+;;   2. that's it! no other reason. could make it configurable ...
 (define-method (session:call-parts (self <session>) page parts)
   (slot-set! self 'curr-page page)
-  (let* ((dir     (string-append (slot-ref self 'sroot) "/pages/" page))
-	 (control (string-append dir "/control.scm"))
-	 (view    (string-append dir "/view.scm"))
+  (let* ((dir-style (eq? (slot-ref self 'page-dir-style) 'onedir)) ;; flag #t for onedir, #f for old style
+	 (dir     (string-append (slot-ref self 'sroot) 
+				 (if dir-style 
+				     (conc "/pages/")
+				     (conc "/pages/" page))))
+	 (control (string-append dir (if dir-style 
+					 (conc page "_ctrl.scm")
+					 "/control.scm")))
+	 (view    (string-append dir (if dir-style 
+					 (conc page "_view.scm")
+					 "/view.scm")))
 	 (load-view    (and (file-exists? view)
 			    (or (eq? parts 'both)(eq? parts 'view))))
 	 (load-control (and (file-exists? control)
 			    (or (eq? parts 'both)(eq? parts 'control))))
-	 (view-dat   '())
-	 (sugar "/home/matt/kiatoa/stml/sugar.scm" ))
+	 (view-dat   '()))
+    ;;   (sugar "/home/matt/kiatoa/stml/sugar.scm" ))
     ;; (print "dir=" dir " control=" control " view=" view " load-view=" load-view " load=control=" load-control)
     (if load-control
 	(begin
 	  (load control)
 	  (session:set-called! self page)))