Altered autoload namespace slightly