diff --git a/libr/fs/Makefile b/libr/fs/Makefile
index f04dedd1ac..5d05f93e7a 100644
--- a/libr/fs/Makefile
+++ b/libr/fs/Makefile
@@ -3,7 +3,8 @@ DEPS=r_lib r_util r_io
 CFLAGS+=-DCORELIB -Iarch/include -Iarch
 
 CFLAGS+=-Ip/grub/include
-LDFLAGS+=p/grub/libgrubfs.a
+SHLR=../../shlr/
+LDFLAGS+=$(SHLR)/grub/libgrubfs.a
 
 include ../config.mk
 
@@ -16,8 +17,8 @@ STATIC_OBJS=$(subst ..,p/..,$(subst fs_,p/fs_,$(STATIC_OBJ)))
 OBJS=${STATIC_OBJS} fs.o file.o 
 #p/grub/main.o
 
-p/grub/libgrubfs.a:
-	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
+#p/grub/libgrubfs.a:
+#	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
 
 pre: 
 	cd d && ${MAKE}
@@ -35,7 +36,7 @@ test:
 	gdb --args r2 -i test.rsc /tmp/test.fs.img
 
 plugins:
-	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
+	#cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
 	cd p && ${MAKE} all
 
 include ../rules.mk
diff --git a/libr/fs/fs.c b/libr/fs/fs.c
index a13dc7484c..751a5af45e 100644
--- a/libr/fs/fs.c
+++ b/libr/fs/fs.c
@@ -4,7 +4,7 @@
 #include "../config.h"
 #include "types.h"
 #include <errno.h>
-#include "p/grub/include/grub/msdos_partition.h"
+#include "../../shlr/grub/include/grub/msdos_partition.h"
 
 R_LIB_VERSION(r_fs);
 
@@ -389,7 +389,7 @@ R_API RFSFile *r_fs_slurp(RFS* fs, const char *path) {
 }
 
 // TODO: move into grubfs
-#include "p/grub/include/grubfs.h"
+#include "../../shlr/grub/include/grubfs.h"
 RList *list = NULL;
 static int parhook (struct grub_disk *disk, struct grub_partition *par, void *closure) {
 	RFSPartition *p = r_fs_partition_new (r_list_length (list), par->start*512, 512*par->len);
diff --git a/libr/fs/p/Makefile b/libr/fs/p/Makefile
index a30f787588..fa03886fdf 100644
--- a/libr/fs/p/Makefile
+++ b/libr/fs/p/Makefile
@@ -1,6 +1,7 @@
 include ../../config.mk
 
-CFLAGS+=-I../../include -Wall -shared -fPIC ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}..
+CFLAGS+=-I$(LIBR)/include -Wall -shared -fPIC ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}..
+GRUB=$(LIBR)../shlr/grub/libgrub.a
 #CFLAGS+=-I../../include
 LDFLAGS+=${LINK}
 
@@ -13,11 +14,9 @@ FILESYSTEMS=ext2.mk fat.mk ntfs.mk reiserfs.mk tar.mk udf.mk ufs2.mk ufs.mk xfs.
 include $(FILESYSTEMS)
 
 all:
-	cd grub && ${MAKE} lib
 
 clean:
 	-rm -f *.${EXT_SO} *.o ${STATIC_OBJ}
-	cd grub && ${MAKE} clean
 
 mrproper: clean
 	-rm -f *.d ../arch/*/*/*.d
diff --git a/libr/fs/p/cpio.mk b/libr/fs/p/cpio.mk
index 7bdfe6d922..770fc38a9e 100644
--- a/libr/fs/p/cpio.mk
+++ b/libr/fs/p/cpio.mk
@@ -1,6 +1,6 @@
 OBJ_CPIO=fs_cpio.o
-EXTRA=../p/grub/libgrubfs.a
-CFLAGS+=-Igrub/include
+EXTRA=$(GRUB)
+CFLAGS+=-I$(SHLR)/grub/include
 
 STATIC_OBJ+=${OBJ_CPIO}
 #STATIC_OBJ+=${EXTRA}
diff --git a/libr/fs/p/ext2.mk b/libr/fs/p/ext2.mk
index 6947e89ea6..e4bd3bf53d 100644
--- a/libr/fs/p/ext2.mk
+++ b/libr/fs/p/ext2.mk
@@ -1,5 +1,5 @@
 OBJ_EXT2=fs_ext2.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_EXT2}
diff --git a/libr/fs/p/fat.mk b/libr/fs/p/fat.mk
index edfe11f98f..3590122a25 100644
--- a/libr/fs/p/fat.mk
+++ b/libr/fs/p/fat.mk
@@ -1,5 +1,5 @@
 OBJ_FAT=fs_fat.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_FAT}
diff --git a/libr/fs/p/fb.mk b/libr/fs/p/fb.mk
index f91cfa6353..de4568eaef 100644
--- a/libr/fs/p/fb.mk
+++ b/libr/fs/p/fb.mk
@@ -1,5 +1,5 @@
 OBJ_FB=fs_fb.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_FB}
diff --git a/libr/fs/p/hfs.mk b/libr/fs/p/hfs.mk
index d5fb931a87..ffc04574a4 100644
--- a/libr/fs/p/hfs.mk
+++ b/libr/fs/p/hfs.mk
@@ -1,5 +1,5 @@
 OBJ_HFS=fs_hfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_HFS}
diff --git a/libr/fs/p/hfsplus.mk b/libr/fs/p/hfsplus.mk
index 0ad01f807f..804743695c 100644
--- a/libr/fs/p/hfsplus.mk
+++ b/libr/fs/p/hfsplus.mk
@@ -1,5 +1,5 @@
 OBJ_HFSPLUS=fs_hfsplus.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_HFSPLUS}
diff --git a/libr/fs/p/iso9660.mk b/libr/fs/p/iso9660.mk
index fd287e77cd..04fa1d3405 100644
--- a/libr/fs/p/iso9660.mk
+++ b/libr/fs/p/iso9660.mk
@@ -1,5 +1,5 @@
 OBJ_ISO9660=fs_iso9660.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_ISO9660}
diff --git a/libr/fs/p/jfs.mk b/libr/fs/p/jfs.mk
index 289589aae4..ac0ea8a0d2 100644
--- a/libr/fs/p/jfs.mk
+++ b/libr/fs/p/jfs.mk
@@ -1,5 +1,5 @@
 OBJ_JFS=fs_jfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_JFS}
diff --git a/libr/fs/p/minix.mk b/libr/fs/p/minix.mk
index efdb1bcff2..76601e07fc 100644
--- a/libr/fs/p/minix.mk
+++ b/libr/fs/p/minix.mk
@@ -1,5 +1,5 @@
 OBJ_MINIX=fs_minix.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_MINIX}
diff --git a/libr/fs/p/ntfs.mk b/libr/fs/p/ntfs.mk
index 1bb1808aed..ba2c9c5f57 100644
--- a/libr/fs/p/ntfs.mk
+++ b/libr/fs/p/ntfs.mk
@@ -1,5 +1,5 @@
 OBJ_NTFS=fs_ntfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_NTFS}
diff --git a/libr/fs/p/reiserfs.mk b/libr/fs/p/reiserfs.mk
index 53bf71d52b..3f31210455 100644
--- a/libr/fs/p/reiserfs.mk
+++ b/libr/fs/p/reiserfs.mk
@@ -1,5 +1,5 @@
 OBJ_REISERFS=fs_reiserfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_REISERFS}
diff --git a/libr/fs/p/sfs.mk b/libr/fs/p/sfs.mk
index 3308bdf7a4..385d4a1722 100644
--- a/libr/fs/p/sfs.mk
+++ b/libr/fs/p/sfs.mk
@@ -1,5 +1,5 @@
 OBJ_SFS=fs_sfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_SFS}
diff --git a/libr/fs/p/tar.mk b/libr/fs/p/tar.mk
index e84dde1566..9bc5e4cf32 100644
--- a/libr/fs/p/tar.mk
+++ b/libr/fs/p/tar.mk
@@ -1,5 +1,5 @@
 OBJ_TAR=fs_tar.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_TAR}
diff --git a/libr/fs/p/udf.mk b/libr/fs/p/udf.mk
index c6b721b7ec..f9f759babb 100644
--- a/libr/fs/p/udf.mk
+++ b/libr/fs/p/udf.mk
@@ -1,5 +1,5 @@
 OBJ_UDF=fs_udf.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UDF}
diff --git a/libr/fs/p/ufs.mk b/libr/fs/p/ufs.mk
index 86adfbc797..d8ee403c9d 100644
--- a/libr/fs/p/ufs.mk
+++ b/libr/fs/p/ufs.mk
@@ -1,5 +1,5 @@
 OBJ_UFS=fs_ufs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UFS}
diff --git a/libr/fs/p/ufs2.mk b/libr/fs/p/ufs2.mk
index 9b1e4b3b9a..9205f3cab7 100644
--- a/libr/fs/p/ufs2.mk
+++ b/libr/fs/p/ufs2.mk
@@ -1,5 +1,5 @@
 OBJ_UFS2=fs_ufs2.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UFS2}
diff --git a/libr/fs/p/xfs.mk b/libr/fs/p/xfs.mk
index a4a7c03f09..3a4b207e5d 100644
--- a/libr/fs/p/xfs.mk
+++ b/libr/fs/p/xfs.mk
@@ -1,5 +1,5 @@
 OBJ_XFS=fs_xfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_XFS}
diff --git a/shlr/Makefile b/shlr/Makefile
index 69a2963f15..e7d72b0f98 100644
--- a/shlr/Makefile
+++ b/shlr/Makefile
@@ -2,7 +2,7 @@ include ../config-user.mk
 include ../mk/${COMPILER}.mk
 
 HOST_CC?=gcc
-MODS=udis86 java tcc zip
+MODS=udis86 java tcc zip grub
 URL=git://github.com/radare/sdb
 PWD=$(shell pwd)
 SDB_CONFIG=${PWD}/sdb-config.mk
diff --git a/libr/fs/p/grub/Makefile b/shlr/grub/Makefile
similarity index 94%
rename from libr/fs/p/grub/Makefile
rename to shlr/grub/Makefile
index 13fdf5ac48..9c461599c3 100644
--- a/libr/fs/p/grub/Makefile
+++ b/shlr/grub/Makefile
@@ -1,8 +1,8 @@
-include ../../../config.mk
+#include ../config.mk
 #CC?=gcc
 CC?=gcc
 #OSTYPE=$(shell uname -s)
-include ../../../../config-user.mk
+include ../../config-user.mk
 RANLIB?=ranlib
 ifeq (${OSTYPE},)
 all:
@@ -53,7 +53,7 @@ KERNFILES+=partmap/sunpc.c
 
 KERNOBJS=$(subst .c,.o,${KERNFILES})
 CFLAGS+=-Iinclude -fPIC 
-CFLAGS+=-I../../../include -DGRUB_TARGET_NO_MODULES
+CFLAGS+=-I../../libr/include -DGRUB_TARGET_NO_MODULES
 CFLAGS+=-g
 
 # This fixes a silly GNU gcc build problem in OSX - BLAME! :D
@@ -64,6 +64,7 @@ endif
 BIN=test${EXT_EXE}
 
 all: ${KERNOBJS}
+	${MAKE} libgrubfs.a
 
 ${BIN}: ${KERNOBJS} main.o
 	${CC} -o ${BIN} main.o ${CFLAGS} ${KERNOBJS}
diff --git a/libr/fs/p/grub/TODO b/shlr/grub/TODO
similarity index 100%
rename from libr/fs/p/grub/TODO
rename to shlr/grub/TODO
diff --git a/libr/fs/p/grub/fs/affs.c b/shlr/grub/fs/affs.c
similarity index 100%
rename from libr/fs/p/grub/fs/affs.c
rename to shlr/grub/fs/affs.c
diff --git a/libr/fs/p/grub/fs/afs.c b/shlr/grub/fs/afs.c
similarity index 100%
rename from libr/fs/p/grub/fs/afs.c
rename to shlr/grub/fs/afs.c
diff --git a/libr/fs/p/grub/fs/afs_be.c b/shlr/grub/fs/afs_be.c
similarity index 100%
rename from libr/fs/p/grub/fs/afs_be.c
rename to shlr/grub/fs/afs_be.c
diff --git a/libr/fs/p/grub/fs/befs.c b/shlr/grub/fs/befs.c
similarity index 100%
rename from libr/fs/p/grub/fs/befs.c
rename to shlr/grub/fs/befs.c
diff --git a/libr/fs/p/grub/fs/befs_be.c b/shlr/grub/fs/befs_be.c
similarity index 100%
rename from libr/fs/p/grub/fs/befs_be.c
rename to shlr/grub/fs/befs_be.c
diff --git a/libr/fs/p/grub/fs/btrfs.c b/shlr/grub/fs/btrfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/btrfs.c
rename to shlr/grub/fs/btrfs.c
diff --git a/libr/fs/p/grub/fs/cpio.c b/shlr/grub/fs/cpio.c
similarity index 100%
rename from libr/fs/p/grub/fs/cpio.c
rename to shlr/grub/fs/cpio.c
diff --git a/libr/fs/p/grub/fs/ext2.c b/shlr/grub/fs/ext2.c
similarity index 100%
rename from libr/fs/p/grub/fs/ext2.c
rename to shlr/grub/fs/ext2.c
diff --git a/libr/fs/p/grub/fs/fat.c b/shlr/grub/fs/fat.c
similarity index 100%
rename from libr/fs/p/grub/fs/fat.c
rename to shlr/grub/fs/fat.c
diff --git a/libr/fs/p/grub/fs/fb.c b/shlr/grub/fs/fb.c
similarity index 100%
rename from libr/fs/p/grub/fs/fb.c
rename to shlr/grub/fs/fb.c
diff --git a/libr/fs/p/grub/fs/fshelp.c b/shlr/grub/fs/fshelp.c
similarity index 100%
rename from libr/fs/p/grub/fs/fshelp.c
rename to shlr/grub/fs/fshelp.c
diff --git a/libr/fs/p/grub/fs/hfs.c b/shlr/grub/fs/hfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/hfs.c
rename to shlr/grub/fs/hfs.c
diff --git a/libr/fs/p/grub/fs/hfsplus.c b/shlr/grub/fs/hfsplus.c
similarity index 100%
rename from libr/fs/p/grub/fs/hfsplus.c
rename to shlr/grub/fs/hfsplus.c
diff --git a/libr/fs/p/grub/fs/iso9660.c b/shlr/grub/fs/iso9660.c
similarity index 100%
rename from libr/fs/p/grub/fs/iso9660.c
rename to shlr/grub/fs/iso9660.c
diff --git a/libr/fs/p/grub/fs/jfs.c b/shlr/grub/fs/jfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/jfs.c
rename to shlr/grub/fs/jfs.c
diff --git a/libr/fs/p/grub/fs/minix.c b/shlr/grub/fs/minix.c
similarity index 100%
rename from libr/fs/p/grub/fs/minix.c
rename to shlr/grub/fs/minix.c
diff --git a/libr/fs/p/grub/fs/minix2.c b/shlr/grub/fs/minix2.c
similarity index 100%
rename from libr/fs/p/grub/fs/minix2.c
rename to shlr/grub/fs/minix2.c
diff --git a/libr/fs/p/grub/fs/nilfs2.c b/shlr/grub/fs/nilfs2.c
similarity index 100%
rename from libr/fs/p/grub/fs/nilfs2.c
rename to shlr/grub/fs/nilfs2.c
diff --git a/libr/fs/p/grub/fs/ntfs.c b/shlr/grub/fs/ntfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/ntfs.c
rename to shlr/grub/fs/ntfs.c
diff --git a/libr/fs/p/grub/fs/ntfscomp.c b/shlr/grub/fs/ntfscomp.c
similarity index 100%
rename from libr/fs/p/grub/fs/ntfscomp.c
rename to shlr/grub/fs/ntfscomp.c
diff --git a/libr/fs/p/grub/fs/reiserfs.c b/shlr/grub/fs/reiserfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/reiserfs.c
rename to shlr/grub/fs/reiserfs.c
diff --git a/libr/fs/p/grub/fs/sfs.c b/shlr/grub/fs/sfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/sfs.c
rename to shlr/grub/fs/sfs.c
diff --git a/libr/fs/p/grub/fs/tar.c b/shlr/grub/fs/tar.c
similarity index 100%
rename from libr/fs/p/grub/fs/tar.c
rename to shlr/grub/fs/tar.c
diff --git a/libr/fs/p/grub/fs/udf.c b/shlr/grub/fs/udf.c
similarity index 100%
rename from libr/fs/p/grub/fs/udf.c
rename to shlr/grub/fs/udf.c
diff --git a/libr/fs/p/grub/fs/ufs.c b/shlr/grub/fs/ufs.c
similarity index 100%
rename from libr/fs/p/grub/fs/ufs.c
rename to shlr/grub/fs/ufs.c
diff --git a/libr/fs/p/grub/fs/ufs2.c b/shlr/grub/fs/ufs2.c
similarity index 100%
rename from libr/fs/p/grub/fs/ufs2.c
rename to shlr/grub/fs/ufs2.c
diff --git a/libr/fs/p/grub/fs/xfs.c b/shlr/grub/fs/xfs.c
similarity index 100%
rename from libr/fs/p/grub/fs/xfs.c
rename to shlr/grub/fs/xfs.c
diff --git a/libr/fs/p/grub/grubfs.c b/shlr/grub/grubfs.c
similarity index 100%
rename from libr/fs/p/grub/grubfs.c
rename to shlr/grub/grubfs.c
diff --git a/libr/fs/p/grub/include/config-util.h b/shlr/grub/include/config-util.h
similarity index 100%
rename from libr/fs/p/grub/include/config-util.h
rename to shlr/grub/include/config-util.h
diff --git a/libr/fs/p/grub/include/config.h b/shlr/grub/include/config.h
similarity index 100%
rename from libr/fs/p/grub/include/config.h
rename to shlr/grub/include/config.h
diff --git a/libr/fs/p/grub/include/grub/aout.h b/shlr/grub/include/grub/aout.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/aout.h
rename to shlr/grub/include/grub/aout.h
diff --git a/libr/fs/p/grub/include/grub/bsdlabel.h b/shlr/grub/include/grub/bsdlabel.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/bsdlabel.h
rename to shlr/grub/include/grub/bsdlabel.h
diff --git a/libr/fs/p/grub/include/grub/bufio.h b/shlr/grub/include/grub/bufio.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/bufio.h
rename to shlr/grub/include/grub/bufio.h
diff --git a/libr/fs/p/grub/include/grub/charset.h b/shlr/grub/include/grub/charset.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/charset.h
rename to shlr/grub/include/grub/charset.h
diff --git a/libr/fs/p/grub/include/grub/command.h b/shlr/grub/include/grub/command.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/command.h
rename to shlr/grub/include/grub/command.h
diff --git a/libr/fs/p/grub/include/grub/cpu/time.h b/shlr/grub/include/grub/cpu/time.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/cpu/time.h
rename to shlr/grub/include/grub/cpu/time.h
diff --git a/libr/fs/p/grub/include/grub/cpu/types.h b/shlr/grub/include/grub/cpu/types.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/cpu/types.h
rename to shlr/grub/include/grub/cpu/types.h
diff --git a/libr/fs/p/grub/include/grub/cs5536.h b/shlr/grub/include/grub/cs5536.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/cs5536.h
rename to shlr/grub/include/grub/cs5536.h
diff --git a/libr/fs/p/grub/include/grub/datetime.h b/shlr/grub/include/grub/datetime.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/datetime.h
rename to shlr/grub/include/grub/datetime.h
diff --git a/libr/fs/p/grub/include/grub/decompressor.h b/shlr/grub/include/grub/decompressor.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/decompressor.h
rename to shlr/grub/include/grub/decompressor.h
diff --git a/libr/fs/p/grub/include/grub/device.h b/shlr/grub/include/grub/device.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/device.h
rename to shlr/grub/include/grub/device.h
diff --git a/libr/fs/p/grub/include/grub/disk.h b/shlr/grub/include/grub/disk.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/disk.h
rename to shlr/grub/include/grub/disk.h
diff --git a/libr/fs/p/grub/include/grub/dl.h b/shlr/grub/include/grub/dl.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/dl.h
rename to shlr/grub/include/grub/dl.h
diff --git a/libr/fs/p/grub/include/grub/emu/console.h b/shlr/grub/include/grub/emu/console.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/emu/console.h
rename to shlr/grub/include/grub/emu/console.h
diff --git a/libr/fs/p/grub/include/grub/emu/getroot.h b/shlr/grub/include/grub/emu/getroot.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/emu/getroot.h
rename to shlr/grub/include/grub/emu/getroot.h
diff --git a/libr/fs/p/grub/include/grub/emu/hostdisk.h b/shlr/grub/include/grub/emu/hostdisk.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/emu/hostdisk.h
rename to shlr/grub/include/grub/emu/hostdisk.h
diff --git a/libr/fs/p/grub/include/grub/emu/misc.h b/shlr/grub/include/grub/emu/misc.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/emu/misc.h
rename to shlr/grub/include/grub/emu/misc.h
diff --git a/libr/fs/p/grub/include/grub/env.h b/shlr/grub/include/grub/env.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/env.h
rename to shlr/grub/include/grub/env.h
diff --git a/libr/fs/p/grub/include/grub/env_private.h b/shlr/grub/include/grub/env_private.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/env_private.h
rename to shlr/grub/include/grub/env_private.h
diff --git a/libr/fs/p/grub/include/grub/err.h b/shlr/grub/include/grub/err.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/err.h
rename to shlr/grub/include/grub/err.h
diff --git a/libr/fs/p/grub/include/grub/extcmd.h b/shlr/grub/include/grub/extcmd.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/extcmd.h
rename to shlr/grub/include/grub/extcmd.h
diff --git a/libr/fs/p/grub/include/grub/fbfs.h b/shlr/grub/include/grub/fbfs.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/fbfs.h
rename to shlr/grub/include/grub/fbfs.h
diff --git a/libr/fs/p/grub/include/grub/file.h b/shlr/grub/include/grub/file.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/file.h
rename to shlr/grub/include/grub/file.h
diff --git a/libr/fs/p/grub/include/grub/fs.h b/shlr/grub/include/grub/fs.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/fs.h
rename to shlr/grub/include/grub/fs.h
diff --git a/libr/fs/p/grub/include/grub/fshelp.h b/shlr/grub/include/grub/fshelp.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/fshelp.h
rename to shlr/grub/include/grub/fshelp.h
diff --git a/libr/fs/p/grub/include/grub/gpt_partition.h b/shlr/grub/include/grub/gpt_partition.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/gpt_partition.h
rename to shlr/grub/include/grub/gpt_partition.h
diff --git a/libr/fs/p/grub/include/grub/hfs.h b/shlr/grub/include/grub/hfs.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/hfs.h
rename to shlr/grub/include/grub/hfs.h
diff --git a/libr/fs/p/grub/include/grub/i18n.h b/shlr/grub/include/grub/i18n.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/i18n.h
rename to shlr/grub/include/grub/i18n.h
diff --git a/libr/fs/p/grub/include/grub/list.h b/shlr/grub/include/grub/list.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/list.h
rename to shlr/grub/include/grub/list.h
diff --git a/libr/fs/p/grub/include/grub/loader.h b/shlr/grub/include/grub/loader.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/loader.h
rename to shlr/grub/include/grub/loader.h
diff --git a/libr/fs/p/grub/include/grub/lvm.h b/shlr/grub/include/grub/lvm.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/lvm.h
rename to shlr/grub/include/grub/lvm.h
diff --git a/libr/fs/p/grub/include/grub/memory.h b/shlr/grub/include/grub/memory.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/memory.h
rename to shlr/grub/include/grub/memory.h
diff --git a/libr/fs/p/grub/include/grub/menu.h b/shlr/grub/include/grub/menu.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/menu.h
rename to shlr/grub/include/grub/menu.h
diff --git a/libr/fs/p/grub/include/grub/menu_viewer.h b/shlr/grub/include/grub/menu_viewer.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/menu_viewer.h
rename to shlr/grub/include/grub/menu_viewer.h
diff --git a/libr/fs/p/grub/include/grub/misc.h b/shlr/grub/include/grub/misc.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/misc.h
rename to shlr/grub/include/grub/misc.h
diff --git a/libr/fs/p/grub/include/grub/mm.h b/shlr/grub/include/grub/mm.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/mm.h
rename to shlr/grub/include/grub/mm.h
diff --git a/libr/fs/p/grub/include/grub/mm_private.h b/shlr/grub/include/grub/mm_private.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/mm_private.h
rename to shlr/grub/include/grub/mm_private.h
diff --git a/libr/fs/p/grub/include/grub/msdos_partition.h b/shlr/grub/include/grub/msdos_partition.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/msdos_partition.h
rename to shlr/grub/include/grub/msdos_partition.h
diff --git a/libr/fs/p/grub/include/grub/net.h b/shlr/grub/include/grub/net.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/net.h
rename to shlr/grub/include/grub/net.h
diff --git a/libr/fs/p/grub/include/grub/normal.h b/shlr/grub/include/grub/normal.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/normal.h
rename to shlr/grub/include/grub/normal.h
diff --git a/libr/fs/p/grub/include/grub/ntfs.h b/shlr/grub/include/grub/ntfs.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/ntfs.h
rename to shlr/grub/include/grub/ntfs.h
diff --git a/libr/fs/p/grub/include/grub/offsets.h b/shlr/grub/include/grub/offsets.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/offsets.h
rename to shlr/grub/include/grub/offsets.h
diff --git a/libr/fs/p/grub/include/grub/parser.h b/shlr/grub/include/grub/parser.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/parser.h
rename to shlr/grub/include/grub/parser.h
diff --git a/libr/fs/p/grub/include/grub/partition.h b/shlr/grub/include/grub/partition.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/partition.h
rename to shlr/grub/include/grub/partition.h
diff --git a/libr/fs/p/grub/include/grub/parttool.h b/shlr/grub/include/grub/parttool.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/parttool.h
rename to shlr/grub/include/grub/parttool.h
diff --git a/libr/fs/p/grub/include/grub/pci.h b/shlr/grub/include/grub/pci.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/pci.h
rename to shlr/grub/include/grub/pci.h
diff --git a/libr/fs/p/grub/include/grub/pciutils.h b/shlr/grub/include/grub/pciutils.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/pciutils.h
rename to shlr/grub/include/grub/pciutils.h
diff --git a/libr/fs/p/grub/include/grub/raid.h b/shlr/grub/include/grub/raid.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/raid.h
rename to shlr/grub/include/grub/raid.h
diff --git a/libr/fs/p/grub/include/grub/reader.h b/shlr/grub/include/grub/reader.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/reader.h
rename to shlr/grub/include/grub/reader.h
diff --git a/libr/fs/p/grub/include/grub/reed_solomon.h b/shlr/grub/include/grub/reed_solomon.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/reed_solomon.h
rename to shlr/grub/include/grub/reed_solomon.h
diff --git a/libr/fs/p/grub/include/grub/relocator.h b/shlr/grub/include/grub/relocator.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/relocator.h
rename to shlr/grub/include/grub/relocator.h
diff --git a/libr/fs/p/grub/include/grub/relocator_private.h b/shlr/grub/include/grub/relocator_private.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/relocator_private.h
rename to shlr/grub/include/grub/relocator_private.h
diff --git a/libr/fs/p/grub/include/grub/search.h b/shlr/grub/include/grub/search.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/search.h
rename to shlr/grub/include/grub/search.h
diff --git a/libr/fs/p/grub/include/grub/serial.h b/shlr/grub/include/grub/serial.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/serial.h
rename to shlr/grub/include/grub/serial.h
diff --git a/libr/fs/p/grub/include/grub/setjmp.h b/shlr/grub/include/grub/setjmp.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/setjmp.h
rename to shlr/grub/include/grub/setjmp.h
diff --git a/libr/fs/p/grub/include/grub/symbol.h b/shlr/grub/include/grub/symbol.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/symbol.h
rename to shlr/grub/include/grub/symbol.h
diff --git a/libr/fs/p/grub/include/grub/term.h b/shlr/grub/include/grub/term.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/term.h
rename to shlr/grub/include/grub/term.h
diff --git a/libr/fs/p/grub/include/grub/terminfo.h b/shlr/grub/include/grub/terminfo.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/terminfo.h
rename to shlr/grub/include/grub/terminfo.h
diff --git a/libr/fs/p/grub/include/grub/test.h b/shlr/grub/include/grub/test.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/test.h
rename to shlr/grub/include/grub/test.h
diff --git a/libr/fs/p/grub/include/grub/time.h b/shlr/grub/include/grub/time.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/time.h
rename to shlr/grub/include/grub/time.h
diff --git a/libr/fs/p/grub/include/grub/tparm.h b/shlr/grub/include/grub/tparm.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/tparm.h
rename to shlr/grub/include/grub/tparm.h
diff --git a/libr/fs/p/grub/include/grub/trig.h b/shlr/grub/include/grub/trig.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/trig.h
rename to shlr/grub/include/grub/trig.h
diff --git a/libr/fs/p/grub/include/grub/types.h b/shlr/grub/include/grub/types.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/types.h
rename to shlr/grub/include/grub/types.h
diff --git a/libr/fs/p/grub/include/grub/unicode.h b/shlr/grub/include/grub/unicode.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/unicode.h
rename to shlr/grub/include/grub/unicode.h
diff --git a/libr/fs/p/grub/include/grub/util/deviceiter.h b/shlr/grub/include/grub/util/deviceiter.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/deviceiter.h
rename to shlr/grub/include/grub/util/deviceiter.h
diff --git a/libr/fs/p/grub/include/grub/util/libnvpair.h b/shlr/grub/include/grub/util/libnvpair.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/libnvpair.h
rename to shlr/grub/include/grub/util/libnvpair.h
diff --git a/libr/fs/p/grub/include/grub/util/lvm.h b/shlr/grub/include/grub/util/lvm.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/lvm.h
rename to shlr/grub/include/grub/util/lvm.h
diff --git a/libr/fs/p/grub/include/grub/util/misc.h b/shlr/grub/include/grub/util/misc.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/misc.h
rename to shlr/grub/include/grub/util/misc.h
diff --git a/libr/fs/p/grub/include/grub/util/ofpath.h b/shlr/grub/include/grub/util/ofpath.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/ofpath.h
rename to shlr/grub/include/grub/util/ofpath.h
diff --git a/libr/fs/p/grub/include/grub/util/raid.h b/shlr/grub/include/grub/util/raid.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/raid.h
rename to shlr/grub/include/grub/util/raid.h
diff --git a/libr/fs/p/grub/include/grub/util/resolve.h b/shlr/grub/include/grub/util/resolve.h
similarity index 100%
rename from libr/fs/p/grub/include/grub/util/resolve.h
rename to shlr/grub/include/grub/util/resolve.h
diff --git a/libr/fs/p/grub/include/grubfs.h b/shlr/grub/include/grubfs.h
similarity index 100%
rename from libr/fs/p/grub/include/grubfs.h
rename to shlr/grub/include/grubfs.h
diff --git a/libr/fs/p/grub/kern/device.c b/shlr/grub/kern/device.c
similarity index 100%
rename from libr/fs/p/grub/kern/device.c
rename to shlr/grub/kern/device.c
diff --git a/libr/fs/p/grub/kern/disk.c b/shlr/grub/kern/disk.c
similarity index 100%
rename from libr/fs/p/grub/kern/disk.c
rename to shlr/grub/kern/disk.c
diff --git a/libr/fs/p/grub/kern/dl.c b/shlr/grub/kern/dl.c
similarity index 100%
rename from libr/fs/p/grub/kern/dl.c
rename to shlr/grub/kern/dl.c
diff --git a/libr/fs/p/grub/kern/env.c b/shlr/grub/kern/env.c
similarity index 100%
rename from libr/fs/p/grub/kern/env.c
rename to shlr/grub/kern/env.c
diff --git a/libr/fs/p/grub/kern/err.c b/shlr/grub/kern/err.c
similarity index 100%
rename from libr/fs/p/grub/kern/err.c
rename to shlr/grub/kern/err.c
diff --git a/libr/fs/p/grub/kern/file.c b/shlr/grub/kern/file.c
similarity index 100%
rename from libr/fs/p/grub/kern/file.c
rename to shlr/grub/kern/file.c
diff --git a/libr/fs/p/grub/kern/fs.c b/shlr/grub/kern/fs.c
similarity index 100%
rename from libr/fs/p/grub/kern/fs.c
rename to shlr/grub/kern/fs.c
diff --git a/libr/fs/p/grub/kern/list.c b/shlr/grub/kern/list.c
similarity index 100%
rename from libr/fs/p/grub/kern/list.c
rename to shlr/grub/kern/list.c
diff --git a/libr/fs/p/grub/kern/misc.c b/shlr/grub/kern/misc.c
similarity index 100%
rename from libr/fs/p/grub/kern/misc.c
rename to shlr/grub/kern/misc.c
diff --git a/libr/fs/p/grub/kern/mm.c b/shlr/grub/kern/mm.c
similarity index 100%
rename from libr/fs/p/grub/kern/mm.c
rename to shlr/grub/kern/mm.c
diff --git a/libr/fs/p/grub/kern/partition.c b/shlr/grub/kern/partition.c
similarity index 100%
rename from libr/fs/p/grub/kern/partition.c
rename to shlr/grub/kern/partition.c
diff --git a/libr/fs/p/grub/kern/term.c b/shlr/grub/kern/term.c
similarity index 100%
rename from libr/fs/p/grub/kern/term.c
rename to shlr/grub/kern/term.c
diff --git a/libr/fs/p/grub/kern/time.c b/shlr/grub/kern/time.c
similarity index 100%
rename from libr/fs/p/grub/kern/time.c
rename to shlr/grub/kern/time.c
diff --git a/libr/fs/p/grub/main.c b/shlr/grub/main.c
similarity index 100%
rename from libr/fs/p/grub/main.c
rename to shlr/grub/main.c
diff --git a/libr/fs/p/grub/partmap/acorn.c b/shlr/grub/partmap/acorn.c
similarity index 100%
rename from libr/fs/p/grub/partmap/acorn.c
rename to shlr/grub/partmap/acorn.c
diff --git a/libr/fs/p/grub/partmap/amiga.c b/shlr/grub/partmap/amiga.c
similarity index 100%
rename from libr/fs/p/grub/partmap/amiga.c
rename to shlr/grub/partmap/amiga.c
diff --git a/libr/fs/p/grub/partmap/apple.c b/shlr/grub/partmap/apple.c
similarity index 100%
rename from libr/fs/p/grub/partmap/apple.c
rename to shlr/grub/partmap/apple.c
diff --git a/libr/fs/p/grub/partmap/bsdlabel.c b/shlr/grub/partmap/bsdlabel.c
similarity index 100%
rename from libr/fs/p/grub/partmap/bsdlabel.c
rename to shlr/grub/partmap/bsdlabel.c
diff --git a/libr/fs/p/grub/partmap/gpt.c b/shlr/grub/partmap/gpt.c
similarity index 100%
rename from libr/fs/p/grub/partmap/gpt.c
rename to shlr/grub/partmap/gpt.c
diff --git a/libr/fs/p/grub/partmap/msdos.c b/shlr/grub/partmap/msdos.c
similarity index 100%
rename from libr/fs/p/grub/partmap/msdos.c
rename to shlr/grub/partmap/msdos.c
diff --git a/libr/fs/p/grub/partmap/sun.c b/shlr/grub/partmap/sun.c
similarity index 100%
rename from libr/fs/p/grub/partmap/sun.c
rename to shlr/grub/partmap/sun.c
diff --git a/libr/fs/p/grub/partmap/sunpc.c b/shlr/grub/partmap/sunpc.c
similarity index 100%
rename from libr/fs/p/grub/partmap/sunpc.c
rename to shlr/grub/partmap/sunpc.c