Feature/restructure

Update to gem.