Fixed issue, which wasdue to class mapping. Need to ensure all paths follow PSR-0
Renamed class files to match PSR-0