Re-organization of the UI files.