Too much forward declaration..
Renamed headers to hpp