Restructure and composer.json changes to try and get package discovery working