Modify list from .cpp and .h to .hpp