Changed folder to structure to allow for C++ projects