Restructured project, working on speeding up SQLite queries