Migrate cpp down to subdirectory