added more commands to new infrastructure and did refactoring / cleanup

#1