Renames some files and adds the possibility to add Addresses.