Preparation for re-organization of devel and test data