Shifting things to appropirate packages and classes.