Cleaned up indentation and minor refactoring
And refactored full zip to its own controller for nicer paths