Reorganized views into folders and modified controllers and link actions to match