yes! maintaining the structure had some other side effects which made the database storage logic more complicated too... I don't think this needs to happen in this PR but when we add the urls it should be done.