Fix warnings and bugs
Moved .h in .hpp