put the size to folders and move the line where the token is generated.

BT#7644