Moved autoloader to bootstrap
Fixed up autoloader