Updated Version with Resources move to right place