Improve callgrind script
Reorganize directories