Some cleaning up.
Moved some files around.