removed moved files
2nd round comparison changes, trying to re-add my modifications back in

ZERO Testing at this stage - Warning