source code reorganizations