Move comments to struct
Remove old interface in favor of default class