restuctured the namespace to create a better organization