Data.py + classes.py refactored