redid file hierarchy, changed to single page style for controllers