added composer, (hopefully) sorted the namespacing