Continued change to module structure, starting byrange functions