Revised layout of files and template useage