source file reorganized