change namespace structure to have no core