Revert "Minor refactoring which will ease in merger"

This reverts commit c22a2d978bae317efc197b8f0e721ee6547e65ae.
Revert "Minor refactoring which will ease in merger"

This reverts commit c22a2d978bae317efc197b8f0e721ee6547e65ae.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch UI_Built_In_Options
# Your branch is up-to-date with 'origin/UI_Built_In_Options'.
#
# Changes to be committed:
#	renamed:    src/main/java/com/example/KitchenSync/Food.java -> src/main/java/com/example/KitchenSync/MacMenuItem.java
#	modified:   src/main/java/com/example/KitchenSync/Meal.java
#	modified:   src/main/java/com/example/KitchenSync/MyActivity.java
#	modified:   src/main/java/com/example/KitchenSync/Station.java
#