Deleted old module, new files added along with sample tests