refactor and rename projects before upgrade to SDL 2.0