Updated structur for PSR-0 and refactored code to PSR-2