diff --git a/Source/Main.lua b/Source/Main.lua
index dd0eb61..cd7358b 100644
--- a/Source/Main.lua
+++ b/Source/Main.lua
@@ -1,21 +1,16 @@
-local gfx <const> = playdate.graphics
-local disp <const> = playdate.display
-
-import "CoreLibs/object"
 import "CoreLibs/graphics"
 import "CoreLibs/sprites"
-import "CoreLibs/math"
 import "Player"
-import "Tilemap"
+import "Map"
+
+gfx <const> = playdate.graphics
+local disp <const> = playdate.display
 
--- Music
-local song1 <const> = playdate.sound.sampleplayer.new("sfx/song1")
--- Font Setup
 local font <const> = gfx.font.new("gfx/font")
 gfx.setFont(font)
-
 gfx.setBackgroundColor(gfx.kColorBlack)
 
+local song1 <const> = playdate.sound.sampleplayer.new("sfx/song1")
 song1:play(0, 1)
 
 addTiles("levels/level1.rocketbyte")
diff --git a/Source/Tilemap.lua b/Source/Tilemap.lua
deleted file mode 100644
index 85ea4e6..0000000
--- a/Source/Tilemap.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local tileTable <const> = gfx.imagetable.new("gfx/tiles")
-local tilemap <const> = gfx.tilemap.new()
-local gfx <const> = playdate.graphics
-
-tilemap:setImageTable(tileTable)
-tilemap:setSize(100,100)
-
-function addTiles(_file)
-    local level = json.decodeFile(_file)
-    for i = 1, #level.tiles, 1 do
-        tilemap:setTileAtPosition(level.tiles[i].x,level.tiles[i].y,level.tiles[i].t)
-    end
-
-    gfx.sprite.addWallSprites(tilemap, {0,1})
-end
-
-function drawTiles()
-    tilemap:draw(0,0)
-end
\ No newline at end of file