improved namespace structure