Reorganized classes and updated imports