incorp. basemodules, rm subdir directive