added new files
cleaned up some files