Restructure against PSR-4 and Composer compatibility