Using this organization scene should speed up setup and keep your game nicely organized! You can download it from BGG here: https://boardgamegeek.com/filepage/179892/organization-scheme