Restructure, symlinks and new icons