Upgrading to PSR-4 and rearranging folders a little.