remove obsolete files
added new files switch to chaining notation