Move data files into subdirectory, add the db ones.