fix
gem structure
some fixes