dev-clone, new dev

Reorganizing, changed a bunch of code.