PSR update, services revriten to yaml, removed unused files