Fix #1, refactor metadata into one file, data.py