restructured the files, updated mustache templates