Fix spec load order, move Feature modules into config