moved ini, refactoring query code, updated readme