Refactored

- Fixed names to adjust to javadoc.
- Modularized Controller to not include movement or Rules attributes.