hierarchy changes

1 files changed, 10 insertions, 13 deletions

diff --git a/src/Editor.zig b/src/Editor.zig
index 42b5619..4b563ad 100644
--- a/src/Editor.zig
+++ b/src/Editor.zig
@@ -1,16 +1,13 @@
-const linux = std.os.linux;
+const es = @import("root");
 const std = @import("std");
 
 const Allocator = std.mem.Allocator;
 const ArrayList = std.ArrayList;
-const Buffer = @import("Buffer.zig");
+const Buffer = es.Buffer;
 const Editor = @This();
-const files = @import("files.zig");
-const Key = @import("key.zig").Key;
-const key_state = @import("key_state.zig");
-const KeyState = key_state.KeyState;
-const STDIN_FILENO = std.os.STDIN_FILENO;
-const StringBuilder = @import("StringBuilder.zig");
+const Key = es.Key;
+const KeyState = es.key_state.KeyState;
+const StringBuilder = es.StringBuilder;
 const StringHashMap = std.StringHashMap;
 
 allocator: Allocator,
@@ -42,7 +39,7 @@ pub fn init(allocator: Allocator) !Editor {
         .statusmsg = null,
         .statusmsg_time = 0,
 
-        .current_state = key_state.defaultState,
+        .current_state = es.key_state.defaultState,
 
         .key_buffer = ArrayList(Key).init(allocator),
         .should_exit = false,
@@ -150,7 +147,7 @@ pub fn killCurrentBuffer(self: *Editor) !bool {
 }
 
 pub fn open(self: *Editor, name: []const u8) !void {
-    const file_path = try files.resolvePath(self.allocator, name);
+    const file_path = try es.files.resolvePath(self.allocator, name);
     defer self.allocator.free(file_path);
 
     if (self.getBufferByPath(file_path)) |buffer| {
@@ -411,9 +408,9 @@ fn getCursorPosition(row: *usize, col: *usize) !void {
 }
 
 fn getWindowSize(rows: *usize, cols: *usize) !void {
-    var ws: linux.winsize = undefined;
-    const rc = linux.ioctl(STDIN_FILENO, linux.T.IOCGWINSZ, @ptrToInt(&ws));
-    switch (linux.getErrno(rc)) {
+    var ws: std.os.linux.winsize = undefined;
+    const rc = std.os.linux.ioctl(std.os.STDIN_FILENO, std.os.linux.T.IOCGWINSZ, @ptrToInt(&ws));
+    switch (std.os.linux.getErrno(rc)) {
         .SUCCESS => {
             cols.* = ws.ws_col;
             rows.* = ws.ws_row;