re-organized structure