Relocating these facter into redstone into their respective modules

Change-Id: I221b8a52631155fb6b0d3ee1016520836d1370c1