Module 'models' refactored to 'common'