File Naming and interior .mod file cleanup

as title