changed build organization to match to org

also enabled the dependency on the messages stuff