Included modules

Too much was getting on Global scope, so put back in place the modules
Formatted code