Re-organize files & add test intercepter