fix error and modified everything to the new folder structure"
PSR