Reorganized source code.