Fixed generator

Fixed namespace of base packages in generator