Beginnings of a minor resource/linking rewrite/reorganization