Prepare to relocate commands to seperate class files.