diff --git a/.gitignore b/.gitignore
index c2b9969..36454bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-src/*.o
-bochs.out
-src/kernel
+*.o
+kernel/bochs.out
+kernel/src/kernel
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..69b9471
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,63 @@
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "base"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host only network IP, allowing you to access it
+  # via the IP.
+  # config.vm.network "33.33.33.10"
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port "http", 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with chef solo, specifying a cookbooks path (relative
+  # to this Vagrantfile), and adding some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "cookbooks"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_server do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end
diff --git a/bochsrc b/kernel/bochsrc
similarity index 100%
rename from bochsrc
rename to kernel/bochsrc
diff --git a/floppy.img b/kernel/floppy.img
similarity index 100%
rename from floppy.img
rename to kernel/floppy.img
diff --git a/run_bochs.sh b/kernel/run_bochs.sh
similarity index 100%
rename from run_bochs.sh
rename to kernel/run_bochs.sh
diff --git a/src/Makefile b/kernel/src/Makefile
similarity index 100%
rename from src/Makefile
rename to kernel/src/Makefile
diff --git a/kernel/src/boot.o b/kernel/src/boot.o
new file mode 100644
index 0000000..fa89888
Binary files /dev/null and b/kernel/src/boot.o differ
diff --git a/src/boot.s b/kernel/src/boot.s
similarity index 100%
rename from src/boot.s
rename to kernel/src/boot.s
diff --git a/src/common.c b/kernel/src/common.c
similarity index 100%
rename from src/common.c
rename to kernel/src/common.c
diff --git a/src/common.h b/kernel/src/common.h
similarity index 100%
rename from src/common.h
rename to kernel/src/common.h
diff --git a/kernel/src/common.o b/kernel/src/common.o
new file mode 100644
index 0000000..5434839
Binary files /dev/null and b/kernel/src/common.o differ
diff --git a/kernel/src/gdt.h b/kernel/src/gdt.h
new file mode 100644
index 0000000..e69de29
diff --git a/kernel/src/kernel b/kernel/src/kernel
new file mode 100755
index 0000000..6e0c68e
Binary files /dev/null and b/kernel/src/kernel differ
diff --git a/src/link.ld b/kernel/src/link.ld
similarity index 100%
rename from src/link.ld
rename to kernel/src/link.ld
diff --git a/src/main.c b/kernel/src/main.c
similarity index 100%
rename from src/main.c
rename to kernel/src/main.c
diff --git a/kernel/src/main.o b/kernel/src/main.o
new file mode 100644
index 0000000..d5b7d60
Binary files /dev/null and b/kernel/src/main.o differ
diff --git a/src/monitor.c b/kernel/src/monitor.c
similarity index 100%
rename from src/monitor.c
rename to kernel/src/monitor.c
diff --git a/src/monitor.h b/kernel/src/monitor.h
similarity index 100%
rename from src/monitor.h
rename to kernel/src/monitor.h
diff --git a/kernel/src/monitor.o b/kernel/src/monitor.o
new file mode 100644
index 0000000..6a445a2
Binary files /dev/null and b/kernel/src/monitor.o differ
diff --git a/update_image.sh b/kernel/update_image.sh
similarity index 100%
rename from update_image.sh
rename to kernel/update_image.sh