Cleanup for SDL2 and split files