Cleanup of the code and removed some dead code
Fixed some minor path issues
Minor name changes