Project restructure and namespacing.