changed files structure
another reorganization of gem structure