Updated Autoloader and other refactorings...