Reorganized project and moved templates into new sturcture