Refactor Next implementation
Rename helper dir