Moved around pubic and private stuff.