Massive cleanup in Modules
Fix .Net 3.5 and Linux build issue