Revert "Many Changes, mostly refactoring"

This reverts commit e0fce4c12c739061c9de3ab73daeb2d93fd98451.

Conflicts:
	Nim/Nim.suo

Signed-off-by: androyd09 <stevelight16@gmail.com>