Refactoring path of blocks items and entities