Tidy up and add files
Updated .gitignore