added composer and changed namespaces