refactored project structure to make querix more modular