Removed unused modules from projects, small structural changes and updates.