add DataLoader
move files in package
dirty but works
dirty but works