Reorganization

- Repackaged the classes