raname files to match class names due to PSR

raname files to match class names due to PSR