Updated al files, commands and structure