Reorganized files and added some basic controller tests