Fixed remapping issues and
added remapping of inner classes
Added a remapping script