Updated Code Base and moved some files around.

Cleaning up some code.