Add compression, add sub-dir