Clean a little and tidy up.
Include new files and split main files and source files.