Split up .hpp/.cpp code, rename wrapper classes