updated namespace organizer