* major rearranging
* added vagrant/puppet for container deployment