Upgrading to use PSR-4 and rearranging folders.