Deployment Package folder re-organisation