Cleaned up some code.
Cleaned up the Classes folder.
fixed build for visual studios