reorganize directories to fit PSR-0