Packed project

Made several changes to everyone's logic to better reflect certain
changes. Please look through your codes in the packages to see what
changes I made.

If there is any objections or confusions, please call me to clarify.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Storage.java