Adding UINode to master branch.
Fixing merge conflicts.
Rearrange files.
Merge pull request #2 from brianmcgue/master

Updates