Move modal into module