Changed file names, included new main template