Bugfix2: extract modules...