Fix naming, paths and add deep_merge as dependency