Proposing a radical restructuring

Proposing a radical restructuring