Combined categories working. closes #41. Cleaned up pre-zip directory