Initial zip work
Moved files around
Import changes