Added class Position, modified all the other classes