restructured zip file a bit