Patch 3: Move Methods and Move  Fields from the old class