First refactor: changing blocks/items to be owned by modules.