add icon and info, organize directories in etc