-Rearranged the namespace layout