Restructured projects / namespaces etc