reorganizing intro modules, tests broken
tests pass, using fully qualified class path naems