updated project folder and namespaces