Fixed broken import and move data to separate folder.