Package / Line refactoring