Working on cleanup
Rework the files.