Deleted some files and reorganized templates