diff --git a/makefile b/makefile
index 61a883a..929f467 100644
--- a/makefile
+++ b/makefile
@@ -1,9 +1,11 @@
-GRAMMAR = expenses
-LEX = src/grammar/$(GRAMMAR).l
-YACC = src/grammar/$(GRAMMAR).y
+BOT = expenses
+LEX = src/$(BOT)/lex.l
+YACC = src/$(BOT)/grammar.y
 BUILDPATH = ./build
 LOCPATH = ./bin
-SRC = src/grammar/types.c $(BUILDPATH)/$(GRAMMAR)/expenses.yy.c $(BUILDPATH)/$(GRAMMAR)/expenses.tab.c src/bot/handlers.c src/bot/context.c src/main.c
+OLEX = $(BUILDPATH)/$(BOT)/lex.yy.c
+OYACC = $(BUILDPATH)/$(BOT)/grammar.tab.c
+SRC = src/$(BOT)/types.c src/$(BOT)/csv.c $(OLEX) $(OYACC) src/core/handlers.c src/core/context.c src/main.c
 INSTALLPATH = /usr/local
 CFLAGS = `pkg-config --cflags glib-2.0`
 LFLAGS =  -lstrophe -lssl -lcrypto `pkg-config --libs glib-2.0` 
@@ -26,9 +28,9 @@
 asan: grammar
 	gcc $(SRC) -o $(LOCPATH)/debug/$(NAME)_debug_asan $(CFLAGS) $(LFLAGS) $(DEBFLAGS) $(LFLAGS_STATUS) -fsanitize=address
 grammar:
-	mkdir -p $(BUILDPATH)/$(GRAMMAR)
-	flex -o $(BUILDPATH)/$(GRAMMAR)/expenses.yy.c $(LEX)
-	bison -o $(BUILDPATH)/$(GRAMMAR)/expenses.tab.c -d $(YACC)
+	mkdir -p $(BUILDPATH)/$(BOT)
+	flex -o $(OLEX) $(LEX)
+	bison -o $(OYACC) -d $(YACC)
 clean:
 	rm -rf $(BUILDPATH)
 	rm -f $(LOCPATH)/debug/$(NAME)_debug