Restructuring and adding example commands