Develop

Fixed composer and namespacing issues