Fix autoloading and includes. Also delete an old file