Organised current_data dir in subdirs