d2: spring break '98, going moduleless!

Change-Id: I428d07318a6a7f065f753c4af4545b7deeb2b72d