Further source code reorganization