diff --git a/Makefile b/Makefile
index 39d69e8..5dc8bd7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,19 @@ BINDIR=/usr/bin
 
 install:
 	for i in scripts brushes fonts palettes;do \
-		mkdir -p ${DESTDIR}${DATADIR}/${NAME}/$$i; \
-	    cp -rp ${NAME}-$$i/* ${DESTDIR}${DATADIR}/${NAME}/$$i/; \
+        DIRNAME=$$(echo $$i | sed -r "s/($$i)/\u\1/"); \
+		mkdir -p ${DESTDIR}${DATADIR}/${NAME}/$$DIRNAME; \
+	    cp -rp ${NAME}-$$i/* ${DESTDIR}${DATADIR}/${NAME}/$$DIRNAME/; \
 	done; \
 	mkdir -p ${DESTDIR}${BINDIR}; \
-	ln -s ${DATADIR}/${NAME}/scripts/${NAME}.sh ${DESTDIR}${BINDIR}/${NAME}; \
+	ln -s ${DATADIR}/${NAME}/Scripts/${NAME}.sh ${DESTDIR}${BINDIR}/${NAME}; \
 	for i in hello prepare render locale tuneup;do \
-		mkdir -p ${DESTDIR}${DATADIR}/${NAME}/scripts/modules/$$i; \
-		cp -rp ${NAME}-scripts-$$i/* ${DESTDIR}${DATADIR}/${NAME}/scripts/modules/$$i/ ; \
+        DIRNAME=$$(echo $$i | sed -r "s/($$i)/\u\1/"); \
+		mkdir -p ${DESTDIR}${DATADIR}/${NAME}/Scripts/Modules/$$DIRNAME; \
+		cp -rp ${NAME}-scripts-$$i/* ${DESTDIR}${DATADIR}/${NAME}/Scripts/Modules/$$DIRNAME/; \
 	done; \
 	for i in brands dist docs icons promo webenv;do \
-	    mkdir -p ${DESTDIR}${DATADIR}/${NAME}/models/$$i ; \
-	    cp -rp ${NAME}-models-$$i/* ${DESTDIR}${DATADIR}/${NAME}/models/$$i/ ;\
+        DIRNAME=$$(echo $$i | sed -r "s/($$i)/\u\1/"); \
+	    mkdir -p ${DESTDIR}${DATADIR}/${NAME}/Models/$$DIRNAME ; \
+	    cp -rp ${NAME}-models-$$i/* ${DESTDIR}${DATADIR}/${NAME}/Models/$$DIRNAME/ ;\
 	done;