Simplified design

As we discussed before. Got rid of ever-engineered classes. Simplified the board state.