fix layout (a bit tricky) and make nordrassil generated code better (especially the one to many part)