diff --git a/lisp/armasm.lsp b/picocalc/lisp/armasm.lsp
similarity index 100%
rename from lisp/armasm.lsp
rename to picocalc/lisp/armasm.lsp
diff --git a/lisp/attiny.lsp b/picocalc/lisp/attiny.lsp
similarity index 100%
rename from lisp/attiny.lsp
rename to picocalc/lisp/attiny.lsp
diff --git a/lisp/bels.lsp b/picocalc/lisp/bels.lsp
similarity index 100%
rename from lisp/bels.lsp
rename to picocalc/lisp/bels.lsp
diff --git a/lisp/edit.lsp b/picocalc/lisp/edit.lsp
similarity index 100%
rename from lisp/edit.lsp
rename to picocalc/lisp/edit.lsp
diff --git a/lisp/mand.lsp b/picocalc/lisp/mand.lsp
similarity index 100%
rename from lisp/mand.lsp
rename to picocalc/lisp/mand.lsp
diff --git a/lisp/pkg.lsp b/picocalc/lisp/pkg.lsp
similarity index 100%
rename from lisp/pkg.lsp
rename to picocalc/lisp/pkg.lsp
diff --git a/lisp/query.lsp b/picocalc/lisp/query.lsp
similarity index 100%
rename from lisp/query.lsp
rename to picocalc/lisp/query.lsp
diff --git a/lisp/r5asm.lsp b/picocalc/lisp/r5asm.lsp
similarity index 100%
rename from lisp/r5asm.lsp
rename to picocalc/lisp/r5asm.lsp
diff --git a/lisp/r5asmpi.lsp b/picocalc/lisp/r5asmpi.lsp
similarity index 100%
rename from lisp/r5asmpi.lsp
rename to picocalc/lisp/r5asmpi.lsp
diff --git a/lisp/rtc.lsp b/picocalc/lisp/rtc.lsp
similarity index 100%
rename from lisp/rtc.lsp
rename to picocalc/lisp/rtc.lsp
diff --git a/lisp/sync.sh b/picocalc/lisp/sync.sh
similarity index 100%
rename from lisp/sync.sh
rename to picocalc/lisp/sync.sh
diff --git a/lisp/tak.lsp b/picocalc/lisp/tak.lsp
similarity index 100%
rename from lisp/tak.lsp
rename to picocalc/lisp/tak.lsp
diff --git a/lisp/tools.lsp b/picocalc/lisp/tools.lsp
similarity index 100%
rename from lisp/tools.lsp
rename to picocalc/lisp/tools.lsp
diff --git a/lisp/ulos.lsp b/picocalc/lisp/ulos.lsp
similarity index 100%
rename from lisp/ulos.lsp
rename to picocalc/lisp/ulos.lsp
diff --git a/lisp/wifi.lsp b/picocalc/lisp/wifi.lsp
similarity index 100%
rename from lisp/wifi.lsp
rename to picocalc/lisp/wifi.lsp
diff --git a/picocalc/ulisp-extensions.ino b/picocalc/ulisp-extensions.ino
index 5f95949..848c4ff 100644
--- a/picocalc/ulisp-extensions.ino
+++ b/picocalc/ulisp-extensions.ino
@@ -195,6 +195,7 @@ fn_sym_def(object *args, object *env)
 }
 
 
+>>>>>>> 5392bac (moving to project folder)
 object *
 fn_listlibrary2(object *args, object *env)
 {
@@ -367,7 +368,6 @@ fn_sd_rename(object *args, object *env)
 	char buffer1[BUFFERSIZE];
 	char buffer2[BUFFERSIZE];
 
-
 	object *pathFrom = car(args);
 	if (!stringp(pathFrom)) {
 		error2("filenames must be strings.");
@@ -392,7 +392,6 @@ fn_sd_remove(object *args, object *env)
 	(void) env;
 	char buffer[BUFFERSIZE];
 
-
 	object *arg = car(args);
 	if (!SD.remove(MakeFilename(arg, buffer))) {
 		return nil;
@@ -407,7 +406,6 @@ fn_sd_existsp(object *args, object *env)
 	(void) env;
 
 	char buffer[BUFFERSIZE];
-
 	object *arg = car(args);
 	if (!SD.exists(MakeFilename(arg, buffer))) {
 		return nil;
@@ -466,9 +464,8 @@ fn_sd_list(object *args, object *env)
 {
 	(void) env;
 
+		SDBegin();
 	char *sd_path_buf = NULL;
-
-	SDBegin();
 	File root;
 	object *result = cons(NULL, NULL);
 	object *ptr = result;
@@ -476,8 +473,8 @@ fn_sd_list(object *args, object *env)
 	if (args != NULL) {
 		object *arg1 = checkstring(first(args));
 		int len = stringlength(arg1) + 2; //make it longer for the initial slash and the null terminator
-		sd_path_buf = (char*)malloc(len);
 
+		sd_path_buf = (char*)malloc(len);
 		if (sd_path_buf != NULL) {
 			cstring(arg1, &sd_path_buf[1], len-1);
 			sd_path_buf[0] = '/';  //really weird way to add a slash at the front...