diff --git a/web/Makefile b/web/Makefile
index d084e32e..4f6d6db7 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -13,26 +13,26 @@ cache:
 	chmod a+rwx templates_c cache
 
 index.html: index.org
-	$(EMACS) -no-site-file -batch -l $(SCRIPTS)/batch.el \
+	$(EMACS) -no-site-file -batch -l $(SCRIPTS)/elisp/org-batch.el \
 	 --visit $(INDEX) -f org-export-as-html
 
 index.txt: index.org
-	$(EMACS) -no-site-file  q -batch -l $(SCRIPTS)/batch.el \
+	$(EMACS) -no-site-file  q -batch -l $(SCRIPTS)/elisp/org-batch.el \
 	 --visit $(INDEX) -f org-export-as-ascii
 
 index.pdf: index.org
-	$(EMACS) -no-site-file -q -batch -l $(SCRIPTS)/batch.el \
+	$(EMACS) -no-site-file -q -batch -l $(SCRIPTS)/elisp/org-batch.el \
 	 --visit $(INDEX) -f org-export-as-pdf
 
 ascii: index.txt
 
 html: index.html
-	 $(SCRIPTS)/org-split-body-toc.sh index.html
+	 $(SCRIPTS)/bin/org-split-body-toc.sh index.html
 
 pdf: index.pdf
 
 apache.conf:
-	./generate-apache-conf.sh
+	./bin/generate-apache-conf.sh
 
 clean:
 	rm -f *~ *.pdf *.tex *.html *.xml *.txt *.conf
diff --git a/web/generate-apache-conf.sh b/web/bin/generate-apache-conf.sh
similarity index 100%
rename from web/generate-apache-conf.sh
rename to web/bin/generate-apache-conf.sh
diff --git a/web/org-split-body-toc.sh b/web/bin/org-split-body-toc.sh
similarity index 100%
rename from web/org-split-body-toc.sh
rename to web/bin/org-split-body-toc.sh
diff --git a/web/color-theme.el b/web/elisp/color-theme.el
similarity index 100%
rename from web/color-theme.el
rename to web/elisp/color-theme.el
diff --git a/web/batch.el b/web/elisp/org-batch.el
similarity index 59%
rename from web/batch.el
rename to web/elisp/org-batch.el
index 4a549d24..058ef541 100644
--- a/web/batch.el
+++ b/web/elisp/org-batch.el
@@ -1,23 +1,20 @@
-;; emacs batch mode configuration
+;; emacs org-mode batch configuration
 
 ;; local emacs extensions
-(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/")
-(add-to-list 'load-path ".")
+(add-to-list 'load-path "./elisp")
 
 ;;; ORG mode
 (require 'org-install)
 (require 'org-exp-blocks)
-
-(require 'color-theme)
-(color-theme-initialize)
-(color-theme-twilight)
-
 (require 'htmlize)
-'(htmlize-ignore-face-size (quote absolute))
-'(htmlize-output-type (quote inline-css))
+
+;; set auto load on .org files
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+
 ;; org mode customisations
 (setq org-export-htmlize-output-type 'css)
 
+
 '(org-export-blocks (quote ((comment org-export-blocks-format-comment t) (ditaa org-export-blocks-format-ditaa nil) (dot org-export-blocks-format-dot t) (r org-export-blocks-format-R nil) (R org-export-blocks-format-R nil))))
 '(org-export-html-inline-images t)
 '(org-export-html-use-infojs t)
@@ -26,5 +23,5 @@
 '(org-export-htmlize-output-type "css")
 '(org-export-html-validation-link "<p class=\"xhtml-validation\"><a href=\"http://validator.w3.org/check?uri=referer\">Validate XHTML 1.0</a></p>")
 '(org-export-html-with-timestamp nil)
-'(org-modules (quote (org-bbdb org-bibtex org-gnus org-info org-jsinfo org-irc org-w3m org-mouse org-eval org-eval-light org-exp-bibtex org-man org-mtags org-panel org-R org-special-blocks org-exp-blocks)))
+'(org-modules (quote (org-bbdb org-bibtex org-info org-jsinfo org-irc org-w3m org-mouse org-eval org-eval-light org-exp-bibtex org-man org-mtags org-panel org-R org-special-blocks org-exp-blocks)))
 
diff --git a/web/themes/color-theme-twilight.el b/web/elisp/themes/color-theme-twilight.el
similarity index 100%
rename from web/themes/color-theme-twilight.el
rename to web/elisp/themes/color-theme-twilight.el