Fixed readability for queries and changed renamed module files. (closes #6, closes #7)