Several headers had been refactored and moved
Merge branch 'master' of https://github.com/alericoveri/hecatomb