3.0 correct the models directories
3.0 adapt folder-structure for 3.0