changed folder structure
changed gem