Changing packages around to match new modules