opam.rb file added and code reorganization