Work on localization support, move around some API classes to make better compatibility