Reorganize the urls and templates and reduce the number of directories.
Added a few icons to start and minor adjustments