Re-organize folders for 1.7 port
Put some files back where they belong
Fixed some of the errors. TODO fix the rest
Did some things to the stuff and the things
Merge branch '1.7-port' of https://github.com/planetguy32/RemainInMotion into 1.7-port

Conflicts:
	src/main/resources/mcmod.info