Move mapped type and enum wrapper declaration before class declaration

Move mapped type and enum wrapper declaration before class declaration #120