reordered directory structure, improved templates and stylesheet
reordered directory structure, improved templates and stylesheet