Renamed some files and added SpriteFontContainer