Refactoring packages and names Catkins style