Set up basic project structure, header files and includes
Merge resolve with previous commit