code organization #871