Changed folder structure to work with PSR-0.