Cleanup and adding the manager package properly.
Cleanup of the gateway packagin.