Updated setup to include devices packages