Rearanged folders and initial work on main template