Restructured to move .h files to includes folder and .cpp to src folder