Everything should be stored in data dir now