Feature reorg

Reorganized module structure