rbenv support, better organization