directories in setup expanded, braces reduced

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>