Reorder gem file
Move current user stuff into helper module