Moving a couple of common files out of a specific step.
Moved a common function to a ComponentHelper class
Added more documentation