Use gutentags and reorganize file a bit