Package restructure for UI classes