Moved more queries out of the global stmt holder. Refactored several things.
Moved more files into subpackages 2/?