Develop

Restructured framework files, started query builder (unfinished).