merging the ui and the ngapp dirs
merging the ui and the ngapp dirs 2