Adding Go-WordMap in AppUtils + Other cleanups.
Resolving File conflicts.