Moved UI stuff into separate namespace