Added Intro module, reorganized WADT module