Modules compacted in one, -update and -deploy options added