Reorganized all classes and packages.