Refactored Address model into common package
Merge