Made some changes to make the modules able to be packaged - still early days