Autoloader update and structure change