Revert "Merge pull request #350 from gburgett/subtree"

This reverts commit 539854440c96b8af8d66c35a82889f02e161997e, reversing
changes made to 853c733fd6971097f42c5ccd3a48492c39be0a3b.
Revert "Merge pull request #380 from pmiossec/create"

This reverts commit 853c733fd6971097f42c5ccd3a48492c39be0a3b, reversing
changes made to 7ab4bb79d477770098e379d73051ad56683acdc0.