merging the ui and the ngapp dirs 2