Split up some modules, add tests for deleting nym