Cleanup Inports and rename classes/fields