Classes structure cleanup and autoloader simplification