move rebar master to depend on new concrete structure; fix dependency issues