UI: Code restructuring/organization.