rename import
fix #309. Don't relog the delete queries
some refactoring
ignore more files