omni: move some files to the right place

Change-Id: I423933eacaef5f3e1aaa16ed375f348b7e41d891
2 files changed