GMP vs GDP new storage warehouse

Our business recently acquired a warehouse for Storage and Distribution Purposes only. It will contain no raw materials (they will be received at the main manufacturing facility) and only finished products.  It is located in the same industrial complex ( 500 yards away) as our main building/manufacturing facility. As a result of this, we are now being audited under module 12, as well as 2 and 11. 

Is it acceptable to use our current GMP program to encompass employees working in the Storage Building and just have the program be an umbrella over both buildings?  I understand GMPs are more strict than GDPs, but I feel like to create a separate GDP program would be nothing more than slicing and dicing the GMP program we currently have to remove any sections that specifically involve food contact surfaces, exposed product, and the like. The GMP program we implement now seems to cover everything a GDP program would. Would this be acceptable? 

Any help would be appreciated. Thank you.  

I would like to make an edit to clarify this a bit. I believe what I am referring to is "GSP", not GDP, as it seems GDP deals with the distribution of pharmaceuticals. Our business deals with food flavors and ingredients.