Agreed, and I think your categorization makes sense, so I've divided them accordingly. Feel free to move them around if needed.