Updated autoload to use correct directory structure