Reorganized the code base.