Cleaned up/customized default code
Renamed commands and subsytems (added suffix)