revert to rely on autolader

otherwise composer don't get a chance to load classes we use in add()

watch out for your defaults. More testing needed.