Changed internal storage
Changed command system to parent/sub-commands