Move towards modularization
Name changes

Helpers were updated.