Added Vagrant; Reorganized code