Delete old files
Move all calculations onto Fragment

-More comprehensive fix for Config change calculations