moving folders to PSR4 and remove some more phpstorm blocks