Add example files (todo) and refactored query components