moved the next generation branch into the trunk, deleted old OMF directories, moved all external software to external directory