Simplified design

Got rid of ever-engineered classes. Simplified the board state.