finished refactoring and adding SQL classes to project