* Re-organise dependencies and recommends now that recommends are installed