diff --git a/dwmbar b/dwmbar
index a5ca45c..00e4aa9 100755
--- a/dwmbar
+++ b/dwmbar
@@ -2,17 +2,26 @@
 VERSION="0.0.1"
 
 RC_LOCATION="/home/$USER/.config/dwmbar/dwmbarrc"
-
-if [[ -f $DEFAULT_RC_LOCATION ]]; then
-	>&2 echo "No dwmbarrc found."
-	exit 1
-fi
+CONFIG_DIR="/home/$USER/.config/dwmbar"
+MODULES_DIR="$CONFIG_DIR/modules"
+CUSTOM_DIR="$MODULES_DIR/custom"
+DWMBARRC="$CONFIG_DIR/dwmbarrc"
+CACHE_DIR="$CONFIG_DIR/.cache"
 
 print_help(){
-echo "dwmbar $VERSION"
-
+	echo "dwmbar $VERSION"
 }
 
+install_files(){
+	[[ ! -d $CONFIG_DIR ]] && cp -r /usr/share/dwmbar $CONFIG_DIR
+	[[ ! -f $DWMBARRC ]] && cp /usr/share/dwmbar/dwmbarrc $DWMBARRC
+	[[ ! -d $MODULES_DIR ]] && cp /usr/share/dwmbar/modules $MODULES_DIR
+	[[ ! -d $CUSTOM_DIR ]] && mkdir $CUSTOM_DIR
+	[[ ! -d $CACHE_DIR ]] && mkdir $CACHE_DIR
+}
+
+install_files
+
 while :; do
 	xsetroot -name "$(exec $RC_LOCATION)"
 done
diff --git a/install.sh b/install.sh
index a8fc3cd..08ed6ad 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-CONFIG_DIR="/home/$USER/.config/dwmbar"
-MODULES_DIR="$CONFIG_DIR/modules"
-CUSTOM_DIR="$MODULES_DIR/custom"
-DWMBARRC="$CONFIG_DIR/dwmbarrc"
 DWMBAR="/usr/bin/dwmbar"
 
 if [ "$EUID" -ne 0 ]
@@ -15,13 +11,14 @@ if [[ ! -f "dwmbar" ]]; then
 	echo "dwmbar executable not found."
 fi
 
+# Create /usr/share/dwmbar
+# Containing example dwmbarrc and modules
+
+mkdir --parents "/usr/share/dwmbar/"
+
+cp -r "./modules" "/usr/share/dwmbar/modules"
+cp -r "./dwmbarrc" "/usr/share/dwmbar/dwmbarrc"
+
+echo "./dwmbar --> /usr/bin/dwmbar"
 cp "./dwmbar" "/usr/bin/dwmbar"
-
-mkdir -p "$CUSTOM_DIR"
-
-for script in $(ls modules); do
-	echo "modules/$script -> $MODULES_DIR/$script"
-	cp "modules/$script" "$MODULES_DIR/$script"
-done
-
-[[ ! -f "$DWMBARRC" ]] && cp "./dwmbarrc" "$DWMBARRC"
+[[ $? -eq 0 ]] && echo "Installation completed successfully"