Changed to .hpp headers