Reorganize the project. Pretty format the query list