diff --git a/bin/screenshot b/bin/screenshot
index 9a506fd..0bc1901 100755
--- a/bin/screenshot
+++ b/bin/screenshot
@@ -1,8 +1,12 @@
 #!/bin/sh
-FILENAME=$(date +%m-%d-%Y:%R:%S)
+YEAR=$(date +%Y)
+MONTH_DAY=$(date +%m-%d)
+FILENAME=$(date +%R:%S)
+mkdir -p ~/pictures/$YEAR/$MONTH_DAY
 if [[ $1 == 1 ]]; then
-  import ~/pictures/$FILENAME.png
+  import clipboard:
+  notify-send "Screenshot taken" "copied to clipboard" -i :
 else
-  import -window root ~/pictures/$FILENAME.png
+  import -window root ~/pictures/$YEAR/$MONTH_DAY/"$FILENAME".png
+  notify-send "Screenshot taken" "saved to ~/pictures/$YEAR/$MONTH_DAY/$FILENAME.png" -i :
 fi
-notify-send "screenshot taken" -i :