use methods to separate query from paginate class.
start testing; renamed old classes with the same name as the new class.