Create non-uplinks before uplinks to fix misbehavior

Fixes #3 

May be not the best fix possible but still.

Also, dont create the nested types -- that was not covered with tests after all.