Fix up default config
use new module layout & make tests suite pass again
bit better handling of servlet container