Remove duplicate packages, complete metadata transformation

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge pull request #40 from djs55/delete-upstream-stuff

Remove duplicate packages, complete metadata transformation