Moving all Vagrant and Chef files to their own suddirectory as to not pollute the root level.

.gitignore

@@ -7,5 +7,5 @@ nohup.out
 
 # Vagrant stuff.
 .vagrant
-/data
+/vagrant/build
-/chef/tmp
+/vagrant/chef/tmp

README.md

@@ -30,17 +30,18 @@ Creating Your VM
 
     cd hapi-fhir-root/
     mvn install # Creates web application .war files. Make sure they're built before proceeding!
+    cd vagrant
     vagrant up # Will take a few minutes to boot up.
 
 Your new server environment should now be running in a headless virtual machine on your local computer. The following step are performed automatically for you within the VM sandbox environment:
 
  * A complete Ubuntu 14.04 Server VM is launched in headless mode, bridged to whatever host network interface you've selected.
  * An IPv4 address is assigned via DHCP.
- * MySQL Server (Community Edition) is installed from the official 10gen repository. (See the [Vagrantfile](https://github.com/preston/hapi-fhir/blob/master/Vagrantfile) for the default root password.)
+ * MySQL Server (Community Edition) is installed from the official 10gen repository. (See the [Vagrantfile](https://github.com/preston/hapi-fhir/blob/master/vagrant/Vagrantfile) for the default root password.)
  * Oracle Java 8 is installed.
  * Tomcat 7 is installed and configured as a system service.
  * All compiled *.war applications are deployed automatically and started.
- * A "fhir" user is added to tomcat-users.xml. See [fhir.json](https://github.com/preston/hapi-fhir/blob/master/chef/data_bags/tomcat_users/fhir.json) for the default password.
+ * A "fhir" user is added to tomcat-users.xml. See [fhir.json](https://github.com/preston/hapi-fhir/blob/master/vagrant/chef/data_bags/tomcat_users/fhir.json) for the default password.
 
 Tomcat will now be running on the VM on port 8080 with the management GUI available. For example, you can now visit:
 
@@ -49,9 +50,9 @@ Tomcat will now be running on the VM on port 8080 with the management GUI availa
 
 Screenshots
 ----
-![Tomcat Manager](https://raw.githubusercontent.com/preston/hapi-fhir/master/docs/screenshots/tomcat.png)
+![Tomcat Manager](https://raw.githubusercontent.com/preston/hapi-fhir/master/vagrant/screenshots/tomcat.png)
 
-![Demo Server](https://raw.githubusercontent.com/preston/hapi-fhir/master/docs/screenshots/hapi-fhir-jpaserver.png)
+![Demo Server](https://raw.githubusercontent.com/preston/hapi-fhir/master/vagrant/screenshots/hapi-fhir-jpaserver.png)
 
 Advanced Configuration
 ----

vagrant/Vagrantfile

@@ -40,6 +40,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 	# the path on the guest to mount the folder. And the optional third
 	# argument is a set of non-required options.
 	config.vm.synced_folder "data", '/data'
+	config.vm.synced_folder "build", '/build'
 
 	# Provider-specific configuration so you can fine-tune various
 	# backing providers for Vagrant. These expose provider-specific options.
@@ -96,12 +97,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 	end
 
 	require 'fileutils'
-	build_dir = File.join('data', 'build')
+	Dir.glob('../**/target/*.war').each do |f|
-	Dir.glob('**/target/*.war').each do |f|
+		FileUtils.cp(f, 'build')
-		FileUtils.cp(f, build_dir)
 	end
 	# Deploy any/all built .war files.
-	config.vm.provision 'shell', inline: 'cp /data/build/*.war /var/lib/tomcat7/webapps'
+	config.vm.provision 'shell', inline: 'cp /build/*.war /var/lib/tomcat7/webapps'
 
 	# Set MySQL to start automatically at boot, and fire it up. 
 	config.vm.provision 'shell', inline: 'update-rc.d mysql defaults'