Added template, restructured projects
Merge