Changed src folders, added QueryExtenders