restructured namespace