Clean namespace layout