updating sdl build with more compact classes