Restructure surf++ storage
These defines are useless.