Restructure project

Also includes JSP changes to remove non-dependants CSS, JS etc.