Reworked module definitions to attempt to resolve problem in www project