Big refactoring and renaming
Refactor: remove PortalBlock and make circling based on cells