Reorganize directory into PSR0