Majour filename/modulename overhaul.