First round of changes for reorganization, including updates to GAV and QS tools fixes