Remove unnecessary implementations of Visitable
Change folders and change queryBuilder