Modified to align to PSR-0
Moved files to new location