Rename file and folder to make them more generic