Moving deliverable to deliverable folder. Resolves #367