Restriction of touch detection + package reorganisation