Moving to 0.2 design

removing some of the unneeded class for the first round of testing