Rename folders, add features, modify templates