Modified structure to use new autoloader