diff --git a/Makefile b/Makefile
deleted file mode 100644
index d7b62e4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-C_SOURCES:=$(wildcard coreutils/*.c)
-C_TARGETS:=$(patsubst coreutils/%.c,bin/%,$(C_SOURCES))
-TARGETS:=$(C_TARGETS)
-
-CFLAGS:=-s -Os -flto -pedantic -Wall -Wextra
-all: bin $(TARGETS)
-
-bin/%: coreutils/%.c
-	$(CC) $(CFLAGS) -o $@ $<
-
-clean:
-	rm bin/*
diff --git a/TODO b/TODO
index 1e896a6..8129c64 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,17 @@
+Makefile(
+
 *Todo:
-chmod
-chown
-printf
-shuf
-id
-du
-df
-dd
+dirname
+basename
+mktemp
+ln
 nice
 nohup
-mktemp
+chmod
+chown
+shuf
+id
+df
+dd
+printf
 test
diff --git a/coreutils/clear.c b/console-tools/clear.c
similarity index 100%
rename from coreutils/clear.c
rename to console-tools/clear.c
diff --git a/coreutils/reset.c b/console-tools/reset.c
similarity index 100%
rename from coreutils/reset.c
rename to console-tools/reset.c
diff --git a/coreutils/getloadavg.c b/miscutils/getloadavg.c
similarity index 100%
rename from coreutils/getloadavg.c
rename to miscutils/getloadavg.c
diff --git a/coreutils/hostname.c b/networking/hostname.c
similarity index 100%
rename from coreutils/hostname.c
rename to networking/hostname.c