Moved module to be under Data. namespace