Reorganized a bunch of classes into different packages