#1 Move files to generated structure; Eliminate direct call execution from tests
#1 Remove unused files; Specify gem version