Moved data files inside data. Minor refactor