Revert "Overall re-structure"

This reverts commit 70604b5337ea16d8b39293d6710f22a408e51a9c.