renamed all classes which where not conform to PSR2