Move folder structure to standard, new zip