add data files and refactor directories