Fix module structure in datatypes

Too many classes combined in single modules. Only highly dependent classes are allowed to stay in one module