WBL: More module refactor, still compile errors