refactoring

(hs related stuff -> subnamespace, renamed last "enemy" to "opponent", config sorted)