Rearrange stuff for better gemification
rename stuff to use underscores
fix imports for gem