Add shim support for module internal files, update todos