Add forgotten modules to setup.py (shame on me)

Change-Id: I8e0ad77f05c6071e6243d7782fde800efed33f9f