Continuation of last change-set

Removed/Renamed modules
fixed unused variable issues
added a number of utility modules