Subproject intrusion-detection/ reorganized