Update Commander.class

Moved structure implementation into the Commander class to simplify things and keep all that information in one place.