Changed directory structure and PSR-0 to PSR-4