Rearranging folders to be PSR-0 autoloader compliant