Report, code reorganization