Restructured
From pure .h files to .h and .cpp