Refactor to remove "galaxy".

Major refactor in that we are renaming it and changing the name spacing.