General code placement improvements.
Cleaning up UI + World + GameplayState.