psr-2 compatibilty fix
Deleted obsolete files