restructuring

Nothing here yet!