Add changes for require paths and file names