minor rename/move files