Cleaned up UI Code

Moved generated files to separate package, and cleaned up some of the UI
code