Restructure for correct Packagist functionality i.e. fix stupid mistakes, resolve issue with PSR-0 loading