Classes structure cleanup and autoloader simplification
Merge branch 'autoloader' into develop