Switched around files to be more organized