Moved gateway module one folder up.
Removed TODO file for pending revising.