restructure system and use only one data dir