restructuring data dir