Continue cleaning up the basic design. In this commit:

1) "men" singleton
2) Dictionary struct public