Adding shapes module.
Refactoring game logic to use the new shape module.