I have moved those files into activities