Code cleanup, added additional modules
Revert back changes to original distribution