Adding a personal module using project module.

Some other cleanup too.