diff --git a/.gitignore b/.gitignore
index 4c44580..f70b39a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,18 +8,18 @@
 !checkstyle.xml
 !pom.xml
 
-!library/
-library/*
-!library/src/
-!library/res/
-!library/AndroidManifest.xml
-!library/pom.xml
+!messagebar/
+messagebar/*
+!messagebar/src/
+!messagebar/res/
+!messagebar/AndroidManifest.xml
+!messagebar/pom.xml
 
-!samples/
-samples/*
-!samples/src/
-!samples/res/
-!samples/AndroidManifest.xml
-!samples/pom.xml
+!messagebar-samples/
+messagebar-samples/*
+!messagebar-samples/src/
+!messagebar-samples/res/
+!messagebar-samples/AndroidManifest.xml
+!messagebar-samples/pom.xml
 
 .DS_store
diff --git a/samples/AndroidManifest.xml b/messagebar-samples/AndroidManifest.xml
similarity index 100%
rename from samples/AndroidManifest.xml
rename to messagebar-samples/AndroidManifest.xml
diff --git a/samples/pom.xml b/messagebar-samples/pom.xml
similarity index 100%
rename from samples/pom.xml
rename to messagebar-samples/pom.xml
diff --git a/samples/res/drawable-hdpi/ic_launcher.png b/messagebar-samples/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/res/drawable-hdpi/ic_launcher.png
rename to messagebar-samples/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/res/drawable-mdpi/ic_launcher.png b/messagebar-samples/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/res/drawable-mdpi/ic_launcher.png
rename to messagebar-samples/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/res/drawable-xhdpi/ic_launcher.png b/messagebar-samples/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/res/drawable-xhdpi/ic_launcher.png
rename to messagebar-samples/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/res/drawable-xhdpi/ic_messagebar_undo.png b/messagebar-samples/res/drawable-xhdpi/ic_messagebar_undo.png
similarity index 100%
rename from samples/res/drawable-xhdpi/ic_messagebar_undo.png
rename to messagebar-samples/res/drawable-xhdpi/ic_messagebar_undo.png
diff --git a/samples/res/layout/main.xml b/messagebar-samples/res/layout/main.xml
similarity index 100%
rename from samples/res/layout/main.xml
rename to messagebar-samples/res/layout/main.xml
diff --git a/samples/res/values/strings.xml b/messagebar-samples/res/values/strings.xml
similarity index 100%
rename from samples/res/values/strings.xml
rename to messagebar-samples/res/values/strings.xml
diff --git a/samples/res/values/themes.xml b/messagebar-samples/res/values/themes.xml
similarity index 100%
rename from samples/res/values/themes.xml
rename to messagebar-samples/res/values/themes.xml
diff --git a/samples/src/net/simonvt/messagebar/samples/SampleActivity.java b/messagebar-samples/src/net/simonvt/messagebar/samples/SampleActivity.java
similarity index 100%
rename from samples/src/net/simonvt/messagebar/samples/SampleActivity.java
rename to messagebar-samples/src/net/simonvt/messagebar/samples/SampleActivity.java
diff --git a/library/AndroidManifest.xml b/messagebar/AndroidManifest.xml
similarity index 100%
rename from library/AndroidManifest.xml
rename to messagebar/AndroidManifest.xml
diff --git a/library/pom.xml b/messagebar/pom.xml
similarity index 100%
rename from library/pom.xml
rename to messagebar/pom.xml
diff --git a/library/res/drawable-hdpi/mb__list_focused_holo.9.png b/messagebar/res/drawable-hdpi/mb__list_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/mb__list_focused_holo.9.png
rename to messagebar/res/drawable-hdpi/mb__list_focused_holo.9.png
diff --git a/library/res/drawable-hdpi/mb__list_longpressed_holo.9.png b/messagebar/res/drawable-hdpi/mb__list_longpressed_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/mb__list_longpressed_holo.9.png
rename to messagebar/res/drawable-hdpi/mb__list_longpressed_holo.9.png
diff --git a/library/res/drawable-hdpi/mb__list_pressed_holo_dark.9.png b/messagebar/res/drawable-hdpi/mb__list_pressed_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-hdpi/mb__list_pressed_holo_dark.9.png
rename to messagebar/res/drawable-hdpi/mb__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/mb__list_selector_disabled_holo_dark.9.png b/messagebar/res/drawable-hdpi/mb__list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-hdpi/mb__list_selector_disabled_holo_dark.9.png
rename to messagebar/res/drawable-hdpi/mb__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/mb__messagebar_background.9.png b/messagebar/res/drawable-hdpi/mb__messagebar_background.9.png
similarity index 100%
rename from library/res/drawable-hdpi/mb__messagebar_background.9.png
rename to messagebar/res/drawable-hdpi/mb__messagebar_background.9.png
diff --git a/library/res/drawable-mdpi/mb__list_focused_holo.9.png b/messagebar/res/drawable-mdpi/mb__list_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/mb__list_focused_holo.9.png
rename to messagebar/res/drawable-mdpi/mb__list_focused_holo.9.png
diff --git a/library/res/drawable-mdpi/mb__list_longpressed_holo.9.png b/messagebar/res/drawable-mdpi/mb__list_longpressed_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/mb__list_longpressed_holo.9.png
rename to messagebar/res/drawable-mdpi/mb__list_longpressed_holo.9.png
diff --git a/library/res/drawable-mdpi/mb__list_pressed_holo_dark.9.png b/messagebar/res/drawable-mdpi/mb__list_pressed_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-mdpi/mb__list_pressed_holo_dark.9.png
rename to messagebar/res/drawable-mdpi/mb__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/mb__list_selector_disabled_holo_dark.9.png b/messagebar/res/drawable-mdpi/mb__list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-mdpi/mb__list_selector_disabled_holo_dark.9.png
rename to messagebar/res/drawable-mdpi/mb__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/mb__messagebar_background.9.png b/messagebar/res/drawable-mdpi/mb__messagebar_background.9.png
similarity index 100%
rename from library/res/drawable-mdpi/mb__messagebar_background.9.png
rename to messagebar/res/drawable-mdpi/mb__messagebar_background.9.png
diff --git a/library/res/drawable-xhdpi/mb__list_focused_holo.9.png b/messagebar/res/drawable-xhdpi/mb__list_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__list_focused_holo.9.png
rename to messagebar/res/drawable-xhdpi/mb__list_focused_holo.9.png
diff --git a/library/res/drawable-xhdpi/mb__list_longpressed_holo.9.png b/messagebar/res/drawable-xhdpi/mb__list_longpressed_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__list_longpressed_holo.9.png
rename to messagebar/res/drawable-xhdpi/mb__list_longpressed_holo.9.png
diff --git a/library/res/drawable-xhdpi/mb__list_pressed_holo_dark.9.png b/messagebar/res/drawable-xhdpi/mb__list_pressed_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__list_pressed_holo_dark.9.png
rename to messagebar/res/drawable-xhdpi/mb__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/mb__list_selector_disabled_holo_dark.9.png b/messagebar/res/drawable-xhdpi/mb__list_selector_disabled_holo_dark.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__list_selector_disabled_holo_dark.9.png
rename to messagebar/res/drawable-xhdpi/mb__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/mb__messagebar_background.9.png b/messagebar/res/drawable-xhdpi/mb__messagebar_background.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__messagebar_background.9.png
rename to messagebar/res/drawable-xhdpi/mb__messagebar_background.9.png
diff --git a/library/res/drawable-xhdpi/mb__messagebar_divider.9.png b/messagebar/res/drawable-xhdpi/mb__messagebar_divider.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/mb__messagebar_divider.9.png
rename to messagebar/res/drawable-xhdpi/mb__messagebar_divider.9.png
diff --git a/library/res/drawable/mb__item_background_holo_dark.xml b/messagebar/res/drawable/mb__item_background_holo_dark.xml
similarity index 100%
rename from library/res/drawable/mb__item_background_holo_dark.xml
rename to messagebar/res/drawable/mb__item_background_holo_dark.xml
diff --git a/library/res/drawable/mb__list_selector_background_transition_holo_dark.xml b/messagebar/res/drawable/mb__list_selector_background_transition_holo_dark.xml
similarity index 100%
rename from library/res/drawable/mb__list_selector_background_transition_holo_dark.xml
rename to messagebar/res/drawable/mb__list_selector_background_transition_holo_dark.xml
diff --git a/library/res/layout/mb__messagebar.xml b/messagebar/res/layout/mb__messagebar.xml
similarity index 100%
rename from library/res/layout/mb__messagebar.xml
rename to messagebar/res/layout/mb__messagebar.xml
diff --git a/library/res/values-sw600dp/styles.xml b/messagebar/res/values-sw600dp/styles.xml
similarity index 100%
rename from library/res/values-sw600dp/styles.xml
rename to messagebar/res/values-sw600dp/styles.xml
diff --git a/library/res/values/attrs.xml b/messagebar/res/values/attrs.xml
similarity index 100%
rename from library/res/values/attrs.xml
rename to messagebar/res/values/attrs.xml
diff --git a/library/res/values/ids.xml b/messagebar/res/values/ids.xml
similarity index 100%
rename from library/res/values/ids.xml
rename to messagebar/res/values/ids.xml
diff --git a/library/res/values/styles.xml b/messagebar/res/values/styles.xml
similarity index 100%
rename from library/res/values/styles.xml
rename to messagebar/res/values/styles.xml
diff --git a/library/src/net/simonvt/messagebar/MessageBar.java b/messagebar/src/net/simonvt/messagebar/MessageBar.java
similarity index 100%
rename from library/src/net/simonvt/messagebar/MessageBar.java
rename to messagebar/src/net/simonvt/messagebar/MessageBar.java
diff --git a/pom.xml b/pom.xml
index 456b389..60edefa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
     <inceptionYear>2012</inceptionYear>
 
     <modules>
-        <module>library</module>
-        <module>samples</module>
+        <module>messagebar</module>
+        <module>messagebar-samples</module>
     </modules>
 
     <scm>