feature, autoload refactoring and naming issues