main breaker panel to sub panel
In the main panel, put the neutral where all the other neutrals are.   Put the ground where all the other grounds are.  Good chance they are all going to the same bus, that is fine in a main panel. 

In the sub-panel, yes, ground and neutral must be separated.