Clean up autoloading and remove require_once calls