cleanup to the utils module for new SDK module locations etc
cleanups while upgrading the SDK module locations