REF: reorganize models so they are contained and separated inside a subdir