Move class definitions to cpp files