Additional modules and updates

Adding additional 3rd and 4th module while updating various files in others.