Changed structure and added rename form