adjusting file structure for psr