Move headers to include/ + refactoring