Added more templates, and controllers for a better structure.