Move to meaningful file names/modules. Added Explicit-Refs language