Fixing folder structure to be PSR-0 compliant.