add n-gram based phrase chooser
move some files around