More modularity, separate scripts/models/data