Rename files for proper structure