Update code to enable modules. Created library