moving everything into Golr module