It's done, I didn't touch the file structure since Composer is smart enough to map classes even if the layout isn't PSR compliant.