Source code reorganization.