src tree small reorganization