Change Fluent factory
Removed old comments
Moved from vendor to Helpers
Added Namespace + comments