Refactor to fit with upcoming structures nbt storage
Preliminary work