Seperated template files and did some renaming