Moved commands to a 'commands' package for better structure