- hopefully the final solution to the module naming problem and duplications