removed unused files.  combined some files.