WIP on fleshing out object model.
Remove old files