Modify the script/data structure

This is the first step towards a proper database.