changed folder structure to comply to PSR