Correct module file names and paths

Tested-on: magrathea <14 May 2014>