Reorganize the main folders to add a pure Staq folder