renamed some files to avoid naming conflicts, created gemfile