moved some classes around. updated the notes with the next things to be done.