Updated all files, commands and structure