Major clean up of the files.  Last stable version before refactoring.