reorganize concerns, don't add enableable by default