Reorganize views and paths to templates