Reorganized classes into subpackages