MISC: Moved everything into a cpp folder