progress on code organization