fixed directory structure to comply with PSR-0