Some minor reorganization of the source code files