Next reorganization of mock files. (#159)