FontAwesome restructure