Switched to using the generated files and directories