Moved to class autoloading and established cleaner structure