[+FEATURE] Refactoring for publishing / part 1