diff --git a/.gitignore b/console-ui/.gitignore
similarity index 100%
rename from .gitignore
rename to console-ui/.gitignore
diff --git a/.travis.yml b/console-ui/.travis.yml
similarity index 100%
rename from .travis.yml
rename to console-ui/.travis.yml
diff --git a/LICENSE.txt b/console-ui/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to console-ui/LICENSE.txt
diff --git a/README.md b/console-ui/README.md
similarity index 100%
rename from README.md
rename to console-ui/README.md
diff --git a/_config.yml b/console-ui/_config.yml
similarity index 100%
rename from _config.yml
rename to console-ui/_config.yml
diff --git a/build.gradle b/console-ui/build.gradle
similarity index 100%
rename from build.gradle
rename to console-ui/build.gradle
diff --git a/doc/ConsoleUI-Logo-small.png b/console-ui/doc/ConsoleUI-Logo-small.png
similarity index 100%
rename from doc/ConsoleUI-Logo-small.png
rename to console-ui/doc/ConsoleUI-Logo-small.png
diff --git a/doc/ConsoleUI-Logo.png b/console-ui/doc/ConsoleUI-Logo.png
similarity index 100%
rename from doc/ConsoleUI-Logo.png
rename to console-ui/doc/ConsoleUI-Logo.png
diff --git a/doc/ConsoleUI-Logo.svg b/console-ui/doc/ConsoleUI-Logo.svg
similarity index 100%
rename from doc/ConsoleUI-Logo.svg
rename to console-ui/doc/ConsoleUI-Logo.svg
diff --git a/doc/howto.md b/console-ui/doc/howto.md
similarity index 100%
rename from doc/howto.md
rename to console-ui/doc/howto.md
diff --git a/doc/screenshots/checkbox_prompt.png b/console-ui/doc/screenshots/checkbox_prompt.png
similarity index 100%
rename from doc/screenshots/checkbox_prompt.png
rename to console-ui/doc/screenshots/checkbox_prompt.png
diff --git a/doc/screenshots/confirmation_prompt.png b/console-ui/doc/screenshots/confirmation_prompt.png
similarity index 100%
rename from doc/screenshots/confirmation_prompt.png
rename to console-ui/doc/screenshots/confirmation_prompt.png
diff --git a/doc/screenshots/expandable_choice_prompt_1.png b/console-ui/doc/screenshots/expandable_choice_prompt_1.png
similarity index 100%
rename from doc/screenshots/expandable_choice_prompt_1.png
rename to console-ui/doc/screenshots/expandable_choice_prompt_1.png
diff --git a/doc/screenshots/expandable_choice_prompt_2.png b/console-ui/doc/screenshots/expandable_choice_prompt_2.png
similarity index 100%
rename from doc/screenshots/expandable_choice_prompt_2.png
rename to console-ui/doc/screenshots/expandable_choice_prompt_2.png
diff --git a/doc/screenshots/expandable_choice_prompt_3.png b/console-ui/doc/screenshots/expandable_choice_prompt_3.png
similarity index 100%
rename from doc/screenshots/expandable_choice_prompt_3.png
rename to console-ui/doc/screenshots/expandable_choice_prompt_3.png
diff --git a/doc/screenshots/input_prompt.png b/console-ui/doc/screenshots/input_prompt.png
similarity index 100%
rename from doc/screenshots/input_prompt.png
rename to console-ui/doc/screenshots/input_prompt.png
diff --git a/doc/screenshots/list_prompt.png b/console-ui/doc/screenshots/list_prompt.png
similarity index 100%
rename from doc/screenshots/list_prompt.png
rename to console-ui/doc/screenshots/list_prompt.png
diff --git a/gradle.properties b/console-ui/gradle.properties
similarity index 100%
rename from gradle.properties
rename to console-ui/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/console-ui/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to console-ui/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/console-ui/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to console-ui/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/console-ui/gradlew
similarity index 100%
rename from gradlew
rename to console-ui/gradlew
diff --git a/gradlew.bat b/console-ui/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to console-ui/gradlew.bat
diff --git a/settings.gradle b/console-ui/settings.gradle
similarity index 100%
rename from settings.gradle
rename to console-ui/settings.gradle
diff --git a/src/main/java/de/codeshelf/consoleui/Basic.java b/console-ui/src/main/java/de/codeshelf/consoleui/Basic.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/Basic.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/Basic.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/AbstractPromptableElement.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/AbstractPromptableElement.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/AbstractPromptableElement.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/AbstractPromptableElement.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/Checkbox.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/Checkbox.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/Checkbox.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/Checkbox.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/ConfirmChoice.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/ConfirmChoice.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/ConfirmChoice.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/ConfirmChoice.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/ExpandableChoice.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/ExpandableChoice.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/ExpandableChoice.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/ExpandableChoice.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/InputValue.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/InputValue.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/InputValue.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/InputValue.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/ListChoice.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/ListChoice.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/ListChoice.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/ListChoice.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/PageSizeType.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/PageSizeType.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/PageSizeType.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/PageSizeType.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/PromptableElementIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/PromptableElementIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/PromptableElementIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/PromptableElementIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/CheckboxItemIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/CheckboxItemIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/CheckboxItemIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/CheckboxItemIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/ChoiceItemIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ChoiceItemIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/ChoiceItemIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ChoiceItemIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/ConsoleUIItemIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ConsoleUIItemIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/ConsoleUIItemIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ConsoleUIItemIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/ListItemIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ListItemIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/ListItemIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/ListItemIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/impl/CheckboxItem.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/CheckboxItem.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/impl/CheckboxItem.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/CheckboxItem.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/impl/ChoiceItem.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/ChoiceItem.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/impl/ChoiceItem.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/ChoiceItem.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/impl/ListItem.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/ListItem.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/impl/ListItem.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/ListItem.java
diff --git a/src/main/java/de/codeshelf/consoleui/elements/items/impl/Separator.java b/console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/Separator.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/elements/items/impl/Separator.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/elements/items/impl/Separator.java
diff --git a/src/main/java/de/codeshelf/consoleui/examples/LongList.java b/console-ui/src/main/java/de/codeshelf/consoleui/examples/LongList.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/examples/LongList.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/examples/LongList.java
diff --git a/src/main/java/de/codeshelf/consoleui/examples/SimpleExample.java b/console-ui/src/main/java/de/codeshelf/consoleui/examples/SimpleExample.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/examples/SimpleExample.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/examples/SimpleExample.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/AbstractPrompt.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/AbstractPrompt.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/AbstractPrompt.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/AbstractPrompt.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/CheckboxResult.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/CheckboxResult.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/CheckboxResult.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/CheckboxResult.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/ConfirmResult.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/ConfirmResult.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/ConfirmResult.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/ConfirmResult.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/ConsolePrompt.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/ConsolePrompt.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/ConsolePrompt.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/ConsolePrompt.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/ExpandableChoiceResult.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/ExpandableChoiceResult.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/ExpandableChoiceResult.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/ExpandableChoiceResult.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/InputResult.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/InputResult.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/InputResult.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/InputResult.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/ListResult.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/ListResult.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/ListResult.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/ListResult.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/PromptIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/PromptIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/PromptIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/PromptIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/PromptResultItemIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/PromptResultItemIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/PromptResultItemIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/PromptResultItemIF.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxItemBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxItemBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxItemBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxItemBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxPromptBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxPromptBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxPromptBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxPromptBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxSeperatorBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxSeperatorBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxSeperatorBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/CheckboxSeperatorBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ConfirmPromptBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ConfirmPromptBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ConfirmPromptBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ConfirmPromptBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceItemBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceItemBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceItemBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceItemBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoicePromptBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoicePromptBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoicePromptBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoicePromptBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceSeparatorBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceSeparatorBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceSeparatorBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ExpandableChoiceSeparatorBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/InputValueBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/InputValueBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/InputValueBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/InputValueBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ListItemBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ListItemBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ListItemBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ListItemBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/ListPromptBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ListPromptBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/ListPromptBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/ListPromptBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/prompt/builder/PromptBuilder.java b/console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/PromptBuilder.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/prompt/builder/PromptBuilder.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/prompt/builder/PromptBuilder.java
diff --git a/src/main/java/de/codeshelf/consoleui/util/BuilderIF.java b/console-ui/src/main/java/de/codeshelf/consoleui/util/BuilderIF.java
similarity index 100%
rename from src/main/java/de/codeshelf/consoleui/util/BuilderIF.java
rename to console-ui/src/main/java/de/codeshelf/consoleui/util/BuilderIF.java
diff --git a/src/main/resources/consoleui_messages.properties b/console-ui/src/main/resources/consoleui_messages.properties
similarity index 100%
rename from src/main/resources/consoleui_messages.properties
rename to console-ui/src/main/resources/consoleui_messages.properties
diff --git a/src/main/resources/consoleui_messages_de_DE.properties b/console-ui/src/main/resources/consoleui_messages_de_DE.properties
similarity index 100%
rename from src/main/resources/consoleui_messages_de_DE.properties
rename to console-ui/src/main/resources/consoleui_messages_de_DE.properties
diff --git a/src/test/java/de/codeshelf/consoleui/prompt/CheckboxPromptTest.java b/console-ui/src/test/java/de/codeshelf/consoleui/prompt/CheckboxPromptTest.java
similarity index 100%
rename from src/test/java/de/codeshelf/consoleui/prompt/CheckboxPromptTest.java
rename to console-ui/src/test/java/de/codeshelf/consoleui/prompt/CheckboxPromptTest.java
diff --git a/src/test/java/de/codeshelf/consoleui/prompt/ExpandableChoicePromptTest.java b/console-ui/src/test/java/de/codeshelf/consoleui/prompt/ExpandableChoicePromptTest.java
similarity index 100%
rename from src/test/java/de/codeshelf/consoleui/prompt/ExpandableChoicePromptTest.java
rename to console-ui/src/test/java/de/codeshelf/consoleui/prompt/ExpandableChoicePromptTest.java
diff --git a/src/test/java/de/codeshelf/consoleui/prompt/PromptBuilderTest.java b/console-ui/src/test/java/de/codeshelf/consoleui/prompt/PromptBuilderTest.java
similarity index 100%
rename from src/test/java/de/codeshelf/consoleui/prompt/PromptBuilderTest.java
rename to console-ui/src/test/java/de/codeshelf/consoleui/prompt/PromptBuilderTest.java