commands and context is now split into different files