refactored / renamed / reorganized lists