A few changes to make it work better. Moved to PSR-4 to reduce depth of folder structure