some hlint suggestions
oops, mixed up combine method cases
renamed main yaml files