merging the ui and the ngapp dirs

Zhen,

This brings together the ngApp and the ui dirs.