change module structure to make tests works again. Rename module to lower case nfw