Re-organization work in progress for GUI part