Reorganize folder and add metadata for making into a gem
Merge branch 'gem' into 'master'