diff --git a/Cargo.lock b/Cargo.lock
index 2636f58..c5758e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,29 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "VoxelGame"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "byteorder",
+ "cgmath",
+ "dirs",
+ "flate2",
+ "fs_extra",
+ "futures",
+ "glob",
+ "image",
+ "linked-hash-map",
+ "noise",
+ "rand 0.8.3",
+ "shaderc",
+ "wgpu",
+ "wgpu_glyph",
+ "winit",
+ "yaml-rust",
+]
+
 [[package]]
 name = "ab_glyph"
 version = "0.2.10"
@@ -2273,30 +2297,6 @@ dependencies = [
  "wgpu",
 ]
 
-[[package]]
-name = "wgpufun"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bytemuck",
- "byteorder",
- "cgmath",
- "dirs",
- "flate2",
- "fs_extra",
- "futures",
- "glob",
- "image",
- "linked-hash-map",
- "noise",
- "rand 0.8.3",
- "shaderc",
- "wgpu",
- "wgpu_glyph",
- "winit",
- "yaml-rust",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
diff --git a/Cargo.toml b/Cargo.toml
index ea21456..f5b276d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
-name = "wgpufun"
+name = "VoxelGame"
 version = "0.1.0"
-authors = ["Piotrek <piotrek54pl@gmail.com>"]
+authors = ["Piotrek <hello@pbaja.me>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 winit = "0.24"
 wgpu = "0.7"
diff --git a/src/app/camera_controller.rs b/src/game/camera_controller.rs
similarity index 100%
rename from src/app/camera_controller.rs
rename to src/game/camera_controller.rs
diff --git a/src/app/mod.rs b/src/game/mod.rs
similarity index 98%
rename from src/app/mod.rs
rename to src/game/mod.rs
index 7e0a0e8..a0511c5 100644
--- a/src/app/mod.rs
+++ b/src/game/mod.rs
@@ -15,12 +15,12 @@ pub enum GameState {
     Running
 }
 
-pub struct App {
+pub struct Game {
     player: Player,
     world: World
 }
 
-impl App {
+impl Game {
     pub fn new(content: &mut dyn ContentView) -> Self {
         let mut app = Self { 
             player: Player::new(),
diff --git a/src/app/player.rs b/src/game/player.rs
similarity index 100%
rename from src/app/player.rs
rename to src/game/player.rs
diff --git a/src/app/world/block.rs b/src/game/world/block.rs
similarity index 100%
rename from src/app/world/block.rs
rename to src/game/world/block.rs
diff --git a/src/app/world/chunk.rs b/src/game/world/chunk.rs
similarity index 98%
rename from src/app/world/chunk.rs
rename to src/game/world/chunk.rs
index 08318a3..3935f3b 100644
--- a/src/app/world/chunk.rs
+++ b/src/game/world/chunk.rs
@@ -8,7 +8,7 @@ use cgmath::Point3;
 use std::io::Write;
 use std::convert::TryInto;
 use std::io::Read;
-use crate::app::world::{WorldBlock, block};
+use crate::game::world::{WorldBlock, block};
 
 pub const SIZE: usize = 32;
 const SIZE_SQ: usize = SIZE*SIZE;
diff --git a/src/app/world/generator.rs b/src/game/world/generator.rs
similarity index 96%
rename from src/app/world/generator.rs
rename to src/game/world/generator.rs
index cf63c43..c0990d8 100644
--- a/src/app/world/generator.rs
+++ b/src/game/world/generator.rs
@@ -2,7 +2,7 @@ use cgmath::Point3;
 use noise::{Perlin, NoiseFn};
 use rand::{Rng, prelude::ThreadRng};
 
-use crate::app::world::{block, block::WorldBlock};
+use crate::game::world::{block, block::WorldBlock};
 
 const SCALE: f64 = 150.0;
 
diff --git a/src/app/world/mod.rs b/src/game/world/mod.rs
similarity index 100%
rename from src/app/world/mod.rs
rename to src/game/world/mod.rs
diff --git a/src/main.rs b/src/main.rs
index 4e220ef..c371891 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,8 +8,8 @@ use winit::{
 mod renderer; 
 use renderer::Renderer;
 
-mod app; 
-use app::{App, GameState};
+mod game; 
+use game::{Game, GameState};
 
 
 fn main() {
@@ -24,7 +24,7 @@ fn main() {
         .expect("Failed to create window");
 
     let mut renderer = Renderer::new(&window);
-    let mut app = App::new(&mut renderer);
+    let mut app = Game::new(&mut renderer);
 
     // Stats
     let mut fps_timer = std::time::Instant::now();
diff --git a/src/renderer/buffers/content.rs b/src/renderer/buffers/content.rs
index 66cfc16..af03f46 100644
--- a/src/renderer/buffers/content.rs
+++ b/src/renderer/buffers/content.rs
@@ -2,7 +2,7 @@ use std::time::Instant;
 use byteorder::{ByteOrder, LittleEndian};
 use std::convert::TryInto;
 use cgmath::Point3;
-use crate::app::world::block::WorldBlock;
+use crate::game::world::block::WorldBlock;
 
 pub const BLOCK_SIZE : usize = 32; // 32x32x32 block size
 pub const BLOCK_TEX_SIZE : usize = 64; // 64x64 blocks in texture
diff --git a/src/renderer/content_view.rs b/src/renderer/content_view.rs
index 322fbd4..81b70fe 100644
--- a/src/renderer/content_view.rs
+++ b/src/renderer/content_view.rs
@@ -1,5 +1,5 @@
 use crate::Renderer;
-use crate::app::world::block::WorldBlock;
+use crate::game::world::block::WorldBlock;
 use cgmath::Point3;
 
 pub trait ContentView {
diff --git a/workspace.code-workspace b/workspace.code-workspace
new file mode 100644
index 0000000..876a149
--- /dev/null
+++ b/workspace.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}
\ No newline at end of file