Minor refactoring. Add empty namespace for UI stuff.
Minor additions to movement etc.