Restructure namespace to make it easier to distribute separate packages in the future