Refactor Filestore and ConsoleCommands