move model classes from Modules/x/Model to Storage/Model