Merge pull request #1 from rjraffa/master

First UI update
Updates for file reorg