Reorganize dev, Add bookmark to fun