Complete restructering and rewrite of many (most?) modules