Move apps into consolidated apps directory