Rename files
Fix add/edit
Internationalize