-removed old freemarker page
-restructured packages