Move virtualScreen to correct package

Other small cleanups.