Reorganized classes
Deleted old modules