First move the whole thing to the top-level proto package name. Secondly change some things around internally to have sub-packages.
Matt Keeler