improved performance on 4 cpus
changed git structure