Refactor modules. DATA MODEL CREATION Fails