Restructuing entire gem, fix spacing.
Merge restructured gem.