Rearranging files in an attempt to fix autoloader