modified the .cpp and .h files to format according to the folders