Tweaked to use submodules better.

Also added default target.