Remove redundant ifdef.
Some renaming.
Make a file saving module.