renamed files to be consistent, added notes