Move Queryable to its own file