better namespace orginization