Cleanup:

Removed some files that were not needed. Moved some files around.