Reorganization of classes into le sweet packagezzz