diff --git a/.github/workflows/pipeline.yml.backup b/.github/workflows/pipeline.yml.backup
deleted file mode 100644
index c48fffd..0000000
--- a/.github/workflows/pipeline.yml.backup
+++ /dev/null
@@ -1,147 +0,0 @@
-name: Makefile CI
-permissions:
-  contents: write
-  actions: read
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-    outputs:
-      found_phrase: ${{ steps.check_phrase.outputs.found_phrase }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Debug Info
-      run: |
-        echo "Current directory: $(pwd)"
-        echo "List of files:"
-        ls -la
-        echo "Environment variables:"
-        env
-        echo "Corremos instaladores principales:"
-        sudo apt update
-        sudo apt install pipx
-        sudo apt install python3-setuptools
-        sudo apt install gcc clang libpq-dev libbsd-dev libncurses-dev valgrind build-essential nasm clang ghc cmake make libxext-dev libbsd-dev libpq-dev -y
-        sudo apt install python3-dev python3-pip -y
-        sudo apt install python3-dev python3-venv python3-wheel -y
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-
-    - name: Cache Francinette
-      id: cache-francinette
-      uses: actions/cache@v3
-      with:
-        path: ~/francinette
-        key: francinette-${GITHUB_SHA}
-
-    - name: Install Francinette
-      if: steps.cache-francinette.outputs.cache-hit != 'true'
-      run: |
-        sudo apt-get update
-        git clone --depth=1 https://github.com/xicodomingues/francinette.git ~/francinette
-        cd ~/francinette
-        bash "./bin/install.sh"
-        if bash ./tester.sh --help; then
-            echo "Francinette installation completed"
-        else
-            echo "Error: Francinette installation failed"
-            exit 1
-        fi
-
-    - name: Verify Francinette installation
-      run: |
-        cd ~/francinette
-        if bash ./bin/update.sh | grep -q "Francinette is updated"; then
-            echo "Francinette se ha instalado correctamente."
-        fi
-
-    - name: List repository contents
-      run: |
-        cd ~/work/libft/libft
-        echo "Current directory: $(pwd)"
-        ls -la
-        cd ~/francinette
-        echo "Current directory: $(pwd)"
-        ls -la
-
-    - name: Install Norminette
-      run: |
-        cd ~
-        sudo apt update
-        sudo apt install python3-setuptools
-        sudo apt install pipx
-        pipx install norminette
-        pipx ensurepath
-        echo "Norminette version:"
-        norminette -v || echo "Failed to get Norminette version"
-        echo "Current directory: $(pwd)"
-        ls -la
-        echo "Norminette location:"
-        whereis norminette
-      shell: /usr/bin/bash -e {0}
-      env:
-        pythonLocation: /opt/hostedtoolcache/Python/3.12.6/x64
-        LD_LIBRARY_PATH: /opt/hostedtoolcache/Python/3.12.6/x64/lib
-
-    - name: Run Norminette
-      run: |
-        echo "Norminette location:"
-        whereis norminette
-        echo "Norminette version:"
-        norminette -v || echo "Failed to get Norminette version"
-        cd ~/work/libft/libft
-        echo "Current directory: $(pwd)"
-        ls -la
-        norminette
-      shell: /usr/bin/bash -e {0}
-
-    - name: Set TERM environment variable
-      run: echo "TERM=xterm" >> $GITHUB_ENV
-      
-    - name: Run Francinette
-      id: check_phrase
-      run: |
-        rm -rf ~/work/libft/libft_tmp
-        cp -r ~/work/libft/libft ~/work/libft/libft_tmp
-        cd ~/work/libft/libft_tmp
-        rm -rf ~/work/libft/libft_tmp/.github/
-        echo "Current directory: $(pwd)"
-        ls -la
-        echo "Norminette version:"
-        norminette -v || echo "Failed to get Norminette version"
-        echo "Ejecutando Francinette:"
-        script -e -c "stdbuf -oL ~/francinette/tester.sh | tee francinette_output.log" /dev/null
-        search_result=$(grep -rnil "All tests passed! Congratulations!" .)
-        echo "Search result: $search_result"
-        if echo "$search_result" | grep -q "output.log"; then
-          echo "output.log found containing 'All tests passed! Congratulations!'."
-          echo "FOUND_PHRASE=true" >> $GITHUB_ENV
-        else
-          echo "FOUND_PHRASE=false" >> $GITHUB_ENV
-        fi
-
-    - name: Create tarball of Francinette Export Tests
-      run: |
-        cd ~
-        tar -czf francinette_exp_tst.tar.gz francinette/temp/
-
-    - name: Upload Francinette Export Tests artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: francinette-exp-test
-        path: ~/francinette_exp_tst.tar.gz
-        if-no-files-found: warn
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
diff --git a/Makefile b/Makefile
index 34c71e1..24b638b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,45 +6,91 @@
 #    By: javifer2 <javifer2@student.42barcelona.co  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/05/22 18:00:37 by javifer2          #+#    #+#              #
-#    Updated: 2025/11/03 15:39:22 by javifer2         ###   ########.fr        #
+#    Updated: 2025/11/29 14:23:00 by javifer2         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-NAME = libft.a
-CC = cc
-CFLAGS = -Wall -Wextra -Werror
+NAME		= libft.a
 
-SRCS = ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_strlen.c ft_memset.c \
-	   ft_bzero.c ft_memcpy.c ft_memmove.c ft_strlcpy.c ft_strlcat.c ft_toupper.c ft_tolower.c \
-	   ft_strchr.c ft_strrchr.c ft_strncmp.c ft_memchr.c ft_memcmp.c ft_strnstr.c ft_atoi.c \
-	   ft_calloc.c ft_strdup.c ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c ft_itoa.c \
-	   ft_strmapi.c ft_striteri.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
+# Compilador y flags
+CC			= cc
+CFLAGS		= -Wall -Wextra -Werror
+INCLUDES	= -I include
 
-BONUS_SRCS = ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c \
-             ft_lstadd_back.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c \
-             ft_lstmap.c
+# Directorios
+SRC_DIR		= src
+OBJ_DIR		= obj
+INC_DIR		= include
 
-OBJS = $(SRCS:.c=.o)
-BONUS_OBJS = $(BONUS_SRCS:.c=.o)
+# Subdirectorios de src
+CHAR_DIR	= $(SRC_DIR)/char
+STR_DIR		= $(SRC_DIR)/str
+MEM_DIR		= $(SRC_DIR)/mem
+CONV_DIR	= $(SRC_DIR)/conv
+FD_DIR		= $(SRC_DIR)/fd
+LST_DIR		= $(SRC_DIR)/lst
 
-AR = ar -rcs
+# Archivos fuente por categoría
+CHAR_SRC	= ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c \
+			  ft_isprint.c ft_toupper.c ft_tolower.c
 
+STR_SRC		= ft_strlen.c ft_strchr.c ft_strrchr.c ft_strncmp.c \
+			  ft_strnstr.c ft_strdup.c ft_strlcpy.c ft_strlcat.c \
+			  ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c \
+			  ft_strmapi.c ft_striteri.c
+
+MEM_SRC		= ft_memset.c ft_bzero.c ft_memcpy.c ft_memmove.c \
+			  ft_memchr.c ft_memcmp.c ft_calloc.c
+
+CONV_SRC	= ft_atoi.c ft_itoa.c
+
+FD_SRC		= ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
+
+LST_SRC		= ft_lstnew.c ft_lstadd_front.c ft_lstadd_back.c ft_lstsize.c \
+			  ft_lstlast.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c ft_lstmap.c
+
+# Rutas completas de fuentes
+SRCS		= $(addprefix $(CHAR_DIR)/, $(CHAR_SRC)) \
+			  $(addprefix $(STR_DIR)/, $(STR_SRC)) \
+			  $(addprefix $(MEM_DIR)/, $(MEM_SRC)) \
+			  $(addprefix $(CONV_DIR)/, $(CONV_SRC)) \
+			  $(addprefix $(FD_DIR)/, $(FD_SRC))
+
+BONUS_SRCS	= $(addprefix $(LST_DIR)/, $(LST_SRC))
+
+# Objetos
+OBJS		= $(SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
+BONUS_OBJS	= $(BONUS_SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
+
+# Colores para output
+GREEN		= \033[0;32m
+YELLOW		= \033[0;33m
+RESET		= \033[0m
+
+# Reglas
 all: $(NAME)
 
-$(NAME): $(OBJS) Makefile libft.h
-	$(AR) $(NAME) $(OBJS)
+$(NAME): $(OBJS)
+	@ar rcs $(NAME) $(OBJS)
+	@echo "$(GREEN)✓ $(NAME) compilado$(RESET)"
 
 bonus: $(OBJS) $(BONUS_OBJS)
-	$(AR) $(NAME) $(OBJS) $(BONUS_OBJS)
+	@ar rcs $(NAME) $(OBJS) $(BONUS_OBJS)
+	@echo "$(GREEN)✓ $(NAME) compilado con bonus$(RESET)"
 
-%.o: %.c libft.h Makefile
-	$(CC) $(CFLAGS) -c -o $@ $<
+# Crear directorios obj y compilar .c a .o
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(INC_DIR)/libft.h
+	@mkdir -p $(dir $@)
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo "$(YELLOW)Compilando: $<$(RESET)"
 
 clean:
-	rm -f $(OBJS) $(BONUS_OBJS)
+	@rm -rf $(OBJ_DIR)
+	@echo "$(GREEN)✓ Objetos eliminados$(RESET)"
 
 fclean: clean
-	rm -f $(NAME)
+	@rm -f $(NAME)
+	@echo "$(GREEN)✓ $(NAME) eliminado$(RESET)"
 
 re: fclean all
 
diff --git a/libft.h b/include/libft.h
similarity index 100%
rename from libft.h
rename to include/libft.h
diff --git a/ft_isalnum.c b/src/char/ft_isalnum.c
similarity index 100%
rename from ft_isalnum.c
rename to src/char/ft_isalnum.c
diff --git a/ft_isalpha.c b/src/char/ft_isalpha.c
similarity index 100%
rename from ft_isalpha.c
rename to src/char/ft_isalpha.c
diff --git a/ft_isascii.c b/src/char/ft_isascii.c
similarity index 100%
rename from ft_isascii.c
rename to src/char/ft_isascii.c
diff --git a/ft_isdigit.c b/src/char/ft_isdigit.c
similarity index 100%
rename from ft_isdigit.c
rename to src/char/ft_isdigit.c
diff --git a/ft_isprint.c b/src/char/ft_isprint.c
similarity index 100%
rename from ft_isprint.c
rename to src/char/ft_isprint.c
diff --git a/ft_tolower.c b/src/char/ft_tolower.c
similarity index 100%
rename from ft_tolower.c
rename to src/char/ft_tolower.c
diff --git a/ft_toupper.c b/src/char/ft_toupper.c
similarity index 100%
rename from ft_toupper.c
rename to src/char/ft_toupper.c
diff --git a/ft_atoi.c b/src/conv/ft_atoi.c
similarity index 100%
rename from ft_atoi.c
rename to src/conv/ft_atoi.c
diff --git a/ft_itoa.c b/src/conv/ft_itoa.c
similarity index 100%
rename from ft_itoa.c
rename to src/conv/ft_itoa.c
diff --git a/ft_putchar_fd.c b/src/fd/ft_putchar_fd.c
similarity index 100%
rename from ft_putchar_fd.c
rename to src/fd/ft_putchar_fd.c
diff --git a/ft_putendl_fd.c b/src/fd/ft_putendl_fd.c
similarity index 100%
rename from ft_putendl_fd.c
rename to src/fd/ft_putendl_fd.c
diff --git a/ft_putnbr_fd.c b/src/fd/ft_putnbr_fd.c
similarity index 100%
rename from ft_putnbr_fd.c
rename to src/fd/ft_putnbr_fd.c
diff --git a/ft_putstr_fd.c b/src/fd/ft_putstr_fd.c
similarity index 100%
rename from ft_putstr_fd.c
rename to src/fd/ft_putstr_fd.c
diff --git a/ft_lstadd_back.c b/src/lst/ft_lstadd_back.c
similarity index 100%
rename from ft_lstadd_back.c
rename to src/lst/ft_lstadd_back.c
diff --git a/ft_lstadd_front.c b/src/lst/ft_lstadd_front.c
similarity index 100%
rename from ft_lstadd_front.c
rename to src/lst/ft_lstadd_front.c
diff --git a/ft_lstclear.c b/src/lst/ft_lstclear.c
similarity index 100%
rename from ft_lstclear.c
rename to src/lst/ft_lstclear.c
diff --git a/ft_lstdelone.c b/src/lst/ft_lstdelone.c
similarity index 100%
rename from ft_lstdelone.c
rename to src/lst/ft_lstdelone.c
diff --git a/ft_lstiter.c b/src/lst/ft_lstiter.c
similarity index 100%
rename from ft_lstiter.c
rename to src/lst/ft_lstiter.c
diff --git a/ft_lstlast.c b/src/lst/ft_lstlast.c
similarity index 100%
rename from ft_lstlast.c
rename to src/lst/ft_lstlast.c
diff --git a/ft_lstmap.c b/src/lst/ft_lstmap.c
similarity index 100%
rename from ft_lstmap.c
rename to src/lst/ft_lstmap.c
diff --git a/ft_lstnew.c b/src/lst/ft_lstnew.c
similarity index 100%
rename from ft_lstnew.c
rename to src/lst/ft_lstnew.c
diff --git a/ft_lstsize.c b/src/lst/ft_lstsize.c
similarity index 100%
rename from ft_lstsize.c
rename to src/lst/ft_lstsize.c
diff --git a/ft_bzero.c b/src/mem/ft_bzero.c
similarity index 100%
rename from ft_bzero.c
rename to src/mem/ft_bzero.c
diff --git a/ft_calloc.c b/src/mem/ft_calloc.c
similarity index 100%
rename from ft_calloc.c
rename to src/mem/ft_calloc.c
diff --git a/ft_memchr.c b/src/mem/ft_memchr.c
similarity index 100%
rename from ft_memchr.c
rename to src/mem/ft_memchr.c
diff --git a/ft_memcmp.c b/src/mem/ft_memcmp.c
similarity index 100%
rename from ft_memcmp.c
rename to src/mem/ft_memcmp.c
diff --git a/ft_memcpy.c b/src/mem/ft_memcpy.c
similarity index 100%
rename from ft_memcpy.c
rename to src/mem/ft_memcpy.c
diff --git a/ft_memmove.c b/src/mem/ft_memmove.c
similarity index 100%
rename from ft_memmove.c
rename to src/mem/ft_memmove.c
diff --git a/ft_memset.c b/src/mem/ft_memset.c
similarity index 100%
rename from ft_memset.c
rename to src/mem/ft_memset.c
diff --git a/ft_split.c b/src/str/ft_split.c
similarity index 100%
rename from ft_split.c
rename to src/str/ft_split.c
diff --git a/ft_strchr.c b/src/str/ft_strchr.c
similarity index 100%
rename from ft_strchr.c
rename to src/str/ft_strchr.c
diff --git a/ft_strdup.c b/src/str/ft_strdup.c
similarity index 100%
rename from ft_strdup.c
rename to src/str/ft_strdup.c
diff --git a/ft_striteri.c b/src/str/ft_striteri.c
similarity index 100%
rename from ft_striteri.c
rename to src/str/ft_striteri.c
diff --git a/ft_strjoin.c b/src/str/ft_strjoin.c
similarity index 100%
rename from ft_strjoin.c
rename to src/str/ft_strjoin.c
diff --git a/ft_strlcat.c b/src/str/ft_strlcat.c
similarity index 100%
rename from ft_strlcat.c
rename to src/str/ft_strlcat.c
diff --git a/ft_strlcpy.c b/src/str/ft_strlcpy.c
similarity index 100%
rename from ft_strlcpy.c
rename to src/str/ft_strlcpy.c
diff --git a/ft_strlen.c b/src/str/ft_strlen.c
similarity index 100%
rename from ft_strlen.c
rename to src/str/ft_strlen.c
diff --git a/ft_strmapi.c b/src/str/ft_strmapi.c
similarity index 100%
rename from ft_strmapi.c
rename to src/str/ft_strmapi.c
diff --git a/ft_strncmp.c b/src/str/ft_strncmp.c
similarity index 100%
rename from ft_strncmp.c
rename to src/str/ft_strncmp.c
diff --git a/ft_strnstr.c b/src/str/ft_strnstr.c
similarity index 100%
rename from ft_strnstr.c
rename to src/str/ft_strnstr.c
diff --git a/ft_strrchr.c b/src/str/ft_strrchr.c
similarity index 100%
rename from ft_strrchr.c
rename to src/str/ft_strrchr.c
diff --git a/ft_strtrim.c b/src/str/ft_strtrim.c
similarity index 100%
rename from ft_strtrim.c
rename to src/str/ft_strtrim.c
diff --git a/ft_substr.c b/src/str/ft_substr.c
similarity index 100%
rename from ft_substr.c
rename to src/str/ft_substr.c