Refactored stuff and PSR-0 autoloader