diff --git a/audio/.DS_Store b/audio/.DS_Store
deleted file mode 100644
index 5f15c9f..0000000
Binary files a/audio/.DS_Store and /dev/null differ
diff --git a/audio/include/.DS_Store b/audio/include/.DS_Store
deleted file mode 100644
index 052ae88..0000000
Binary files a/audio/include/.DS_Store and /dev/null differ
diff --git a/audio/src/.DS_Store b/audio/src/.DS_Store
deleted file mode 100644
index 653db42..0000000
Binary files a/audio/src/.DS_Store and /dev/null differ
diff --git a/core/.DS_Store b/core/.DS_Store
deleted file mode 100644
index f378fe4..0000000
Binary files a/core/.DS_Store and /dev/null differ
diff --git a/core/build/.DS_Store b/core/build/.DS_Store
deleted file mode 100644
index 1e445ce..0000000
Binary files a/core/build/.DS_Store and /dev/null differ
diff --git a/core/resources/.DS_Store b/core/resources/.DS_Store
deleted file mode 100644
index 1375bbf..0000000
Binary files a/core/resources/.DS_Store and /dev/null differ
diff --git a/audio/include/audio_handler.h b/crimata/audio/include/audio_handler.h
similarity index 100%
rename from audio/include/audio_handler.h
rename to crimata/audio/include/audio_handler.h
diff --git a/audio/include/frame_buffer.h b/crimata/audio/include/frame_buffer.h
similarity index 100%
rename from audio/include/frame_buffer.h
rename to crimata/audio/include/frame_buffer.h
diff --git a/audio/src/audio_handler.c b/crimata/audio/src/audio_handler.c
similarity index 100%
rename from audio/src/audio_handler.c
rename to crimata/audio/src/audio_handler.c
diff --git a/audio/src/frame_buffer.c b/crimata/audio/src/frame_buffer.c
similarity index 100%
rename from audio/src/frame_buffer.c
rename to crimata/audio/src/frame_buffer.c
diff --git a/core/Info.plist b/crimata/core/Info.plist
similarity index 100%
rename from core/Info.plist
rename to crimata/core/Info.plist
diff --git a/core/build/apps/Crimata.app/Contents/Info.plist b/crimata/core/build/apps/Crimata.app/Contents/Info.plist
similarity index 100%
rename from core/build/apps/Crimata.app/Contents/Info.plist
rename to crimata/core/build/apps/Crimata.app/Contents/Info.plist
diff --git a/crimata/core/build/apps/Crimata.app/Contents/MacOS/Crimata b/crimata/core/build/apps/Crimata.app/Contents/MacOS/Crimata
new file mode 100755
index 0000000..83d4b1d
Binary files /dev/null and b/crimata/core/build/apps/Crimata.app/Contents/MacOS/Crimata differ
diff --git a/core/build/apps/Crimata.app/Contents/Resources/ICON.icns b/crimata/core/build/apps/Crimata.app/Contents/Resources/ICON.icns
similarity index 100%
rename from core/build/apps/Crimata.app/Contents/Resources/ICON.icns
rename to crimata/core/build/apps/Crimata.app/Contents/Resources/ICON.icns
diff --git a/core/build/objects/src/main.o b/crimata/core/build/objects/src/main.o
similarity index 78%
rename from core/build/objects/src/main.o
rename to crimata/core/build/objects/src/main.o
index d057706..422c2c3 100644
Binary files a/core/build/objects/src/main.o and b/crimata/core/build/objects/src/main.o differ
diff --git a/core/include/main.h b/crimata/core/include/main.h
similarity index 100%
rename from core/include/main.h
rename to crimata/core/include/main.h
diff --git a/core/makefile b/crimata/core/makefile
similarity index 100%
rename from core/makefile
rename to crimata/core/makefile
diff --git a/core/resources/ICON.icns b/crimata/core/resources/ICON.icns
similarity index 100%
rename from core/resources/ICON.icns
rename to crimata/core/resources/ICON.icns
diff --git a/core/src/main.c b/crimata/core/src/main.c
similarity index 99%
rename from core/src/main.c
rename to crimata/core/src/main.c
index 2dd1393..50e96b2 100644
--- a/core/src/main.c
+++ b/crimata/core/src/main.c
@@ -39,7 +39,7 @@ static char* user_id;
 
 void * anim_handler ()
 {
-    standby_anim ();
+    start_up_anim ();
 
     // while (!exit)
     // {
diff --git a/gui/include/anims.h b/crimata/gui/include/anims.h
similarity index 100%
rename from gui/include/anims.h
rename to crimata/gui/include/anims.h
diff --git a/gui/include/eases.h b/crimata/gui/include/eases.h
similarity index 100%
rename from gui/include/eases.h
rename to crimata/gui/include/eases.h
diff --git a/gui/include/gtk-cairo_api.h b/crimata/gui/include/gtk-cairo_api.h
similarity index 100%
rename from gui/include/gtk-cairo_api.h
rename to crimata/gui/include/gtk-cairo_api.h
diff --git a/gui/src/anims.c b/crimata/gui/src/anims.c
similarity index 100%
rename from gui/src/anims.c
rename to crimata/gui/src/anims.c
diff --git a/gui/src/bounce_anim.c b/crimata/gui/src/bounce_anim.c
similarity index 100%
rename from gui/src/bounce_anim.c
rename to crimata/gui/src/bounce_anim.c
diff --git a/gui/src/eases.c b/crimata/gui/src/eases.c
similarity index 100%
rename from gui/src/eases.c
rename to crimata/gui/src/eases.c
diff --git a/gui/src/gtk-cairo_api.c b/crimata/gui/src/gtk-cairo_api.c
similarity index 100%
rename from gui/src/gtk-cairo_api.c
rename to crimata/gui/src/gtk-cairo_api.c
diff --git a/gui/src/print_anim.c b/crimata/gui/src/print_anim.c
similarity index 100%
rename from gui/src/print_anim.c
rename to crimata/gui/src/print_anim.c
diff --git a/gui/src/recording_anim.c b/crimata/gui/src/recording_anim.c
similarity index 100%
rename from gui/src/recording_anim.c
rename to crimata/gui/src/recording_anim.c
diff --git a/gui/src/standby_anim.c b/crimata/gui/src/standby_anim.c
similarity index 100%
rename from gui/src/standby_anim.c
rename to crimata/gui/src/standby_anim.c
diff --git a/gui/src/start_up_anim.c b/crimata/gui/src/start_up_anim.c
similarity index 100%
rename from gui/src/start_up_anim.c
rename to crimata/gui/src/start_up_anim.c
diff --git a/gui/src/window 2.css b/crimata/gui/src/window 2.css
similarity index 100%
rename from gui/src/window 2.css
rename to crimata/gui/src/window 2.css
diff --git a/gui/src/window 2.ui b/crimata/gui/src/window 2.ui
similarity index 100%
rename from gui/src/window 2.ui
rename to crimata/gui/src/window 2.ui
diff --git a/gui/src/window.css b/crimata/gui/src/window.css
similarity index 100%
rename from gui/src/window.css
rename to crimata/gui/src/window.css
diff --git a/gui/src/window.ui b/crimata/gui/src/window.ui
similarity index 100%
rename from gui/src/window.ui
rename to crimata/gui/src/window.ui
diff --git a/networking/include/package_handler 2.h b/crimata/networking/include/package_handler 2.h
similarity index 100%
rename from networking/include/package_handler 2.h
rename to crimata/networking/include/package_handler 2.h
diff --git a/networking/include/package_handler.h b/crimata/networking/include/package_handler.h
similarity index 100%
rename from networking/include/package_handler.h
rename to crimata/networking/include/package_handler.h
diff --git a/networking/src/package_handler 2.c b/crimata/networking/src/package_handler 2.c
similarity index 100%
rename from networking/src/package_handler 2.c
rename to crimata/networking/src/package_handler 2.c
diff --git a/networking/src/package_handler.c b/crimata/networking/src/package_handler.c
similarity index 100%
rename from networking/src/package_handler.c
rename to crimata/networking/src/package_handler.c
diff --git a/resources/homepage.png b/resources/homepage.png
new file mode 100644
index 0000000..1ebf5ac
Binary files /dev/null and b/resources/homepage.png differ