diff --git a/.gitignore b/.gitignore
index a02fbbe0..2055b7f6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,17 @@
-/gen
-/bin
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties/gen
+
diff --git a/.classpath b/XBMCRemote/.classpath
similarity index 100%
rename from .classpath
rename to XBMCRemote/.classpath
diff --git a/.project b/XBMCRemote/.project
similarity index 100%
rename from .project
rename to XBMCRemote/.project
diff --git a/.settings/org.eclipse.jdt.core.prefs b/XBMCRemote/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to XBMCRemote/.settings/org.eclipse.jdt.core.prefs
diff --git a/AndroidManifest.xml b/XBMCRemote/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to XBMCRemote/AndroidManifest.xml
diff --git a/default.properties b/XBMCRemote/default.properties
similarity index 100%
rename from default.properties
rename to XBMCRemote/default.properties
diff --git a/lib-src/org/codehaus/jackson/Base64Variant.java b/XBMCRemote/lib-src/org/codehaus/jackson/Base64Variant.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/Base64Variant.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/Base64Variant.java
diff --git a/lib-src/org/codehaus/jackson/Base64Variants.java b/XBMCRemote/lib-src/org/codehaus/jackson/Base64Variants.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/Base64Variants.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/Base64Variants.java
diff --git a/lib-src/org/codehaus/jackson/JsonEncoding.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonEncoding.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonEncoding.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonEncoding.java
diff --git a/lib-src/org/codehaus/jackson/JsonFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonFactory.java
diff --git a/lib-src/org/codehaus/jackson/JsonGenerationException.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonGenerationException.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonGenerationException.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonGenerationException.java
diff --git a/lib-src/org/codehaus/jackson/JsonGenerator.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonGenerator.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonGenerator.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonGenerator.java
diff --git a/lib-src/org/codehaus/jackson/JsonLocation.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonLocation.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonLocation.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonLocation.java
diff --git a/lib-src/org/codehaus/jackson/JsonNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonNode.java
diff --git a/lib-src/org/codehaus/jackson/JsonParseException.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonParseException.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonParseException.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonParseException.java
diff --git a/lib-src/org/codehaus/jackson/JsonParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonParser.java
diff --git a/lib-src/org/codehaus/jackson/JsonProcessingException.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonProcessingException.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonProcessingException.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonProcessingException.java
diff --git a/lib-src/org/codehaus/jackson/JsonStreamContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonStreamContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonStreamContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonStreamContext.java
diff --git a/lib-src/org/codehaus/jackson/JsonToken.java b/XBMCRemote/lib-src/org/codehaus/jackson/JsonToken.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/JsonToken.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/JsonToken.java
diff --git a/lib-src/org/codehaus/jackson/ObjectCodec.java b/XBMCRemote/lib-src/org/codehaus/jackson/ObjectCodec.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/ObjectCodec.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/ObjectCodec.java
diff --git a/lib-src/org/codehaus/jackson/PrettyPrinter.java b/XBMCRemote/lib-src/org/codehaus/jackson/PrettyPrinter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/PrettyPrinter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/PrettyPrinter.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JacksonAnnotation.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JacksonAnnotation.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JacksonAnnotation.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JacksonAnnotation.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonAnySetter.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonAnySetter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonAnySetter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonAnySetter.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonAutoDetect.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonAutoDetect.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonAutoDetect.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonAutoDetect.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonClass.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonClass.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonClass.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonClass.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonContentClass.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonContentClass.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonContentClass.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonContentClass.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonCreator.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonCreator.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonCreator.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonCreator.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonGetter.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonGetter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonGetter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonGetter.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonIgnore.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonIgnore.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonIgnore.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonIgnore.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonIgnoreProperties.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonIgnoreProperties.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonIgnoreProperties.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonIgnoreProperties.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonKeyClass.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonKeyClass.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonKeyClass.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonKeyClass.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonMethod.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonMethod.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonMethod.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonMethod.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonProperty.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonProperty.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonProperty.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonProperty.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonPropertyOrder.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonPropertyOrder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonPropertyOrder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonPropertyOrder.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonSetter.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonSetter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonSetter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonSetter.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonSubTypes.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonSubTypes.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonSubTypes.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonSubTypes.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonTypeInfo.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonTypeInfo.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonTypeInfo.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonTypeInfo.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonTypeName.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonTypeName.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonTypeName.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonTypeName.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonValue.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonValue.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonValue.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonValue.java
diff --git a/lib-src/org/codehaus/jackson/annotate/JsonWriteNullProperties.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
diff --git a/lib-src/org/codehaus/jackson/annotate/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/annotate/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/annotate/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/annotate/package-info.java
diff --git a/lib-src/org/codehaus/jackson/impl/ByteSourceBootstrapper.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/ByteSourceBootstrapper.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/ByteSourceBootstrapper.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/ByteSourceBootstrapper.java
diff --git a/lib-src/org/codehaus/jackson/impl/DefaultPrettyPrinter.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/DefaultPrettyPrinter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/DefaultPrettyPrinter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/DefaultPrettyPrinter.java
diff --git a/lib-src/org/codehaus/jackson/impl/Indenter.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/Indenter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/Indenter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/Indenter.java
diff --git a/lib-src/org/codehaus/jackson/impl/JsonGeneratorBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonGeneratorBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/JsonGeneratorBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonGeneratorBase.java
diff --git a/lib-src/org/codehaus/jackson/impl/JsonNumericParserBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonNumericParserBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/JsonNumericParserBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonNumericParserBase.java
diff --git a/lib-src/org/codehaus/jackson/impl/JsonParserBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonParserBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/JsonParserBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonParserBase.java
diff --git a/lib-src/org/codehaus/jackson/impl/JsonReadContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonReadContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/JsonReadContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonReadContext.java
diff --git a/lib-src/org/codehaus/jackson/impl/JsonWriteContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonWriteContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/JsonWriteContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/JsonWriteContext.java
diff --git a/lib-src/org/codehaus/jackson/impl/ReaderBasedNumericParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedNumericParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/ReaderBasedNumericParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedNumericParser.java
diff --git a/lib-src/org/codehaus/jackson/impl/ReaderBasedParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/ReaderBasedParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedParser.java
diff --git a/lib-src/org/codehaus/jackson/impl/ReaderBasedParserBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedParserBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/ReaderBasedParserBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/ReaderBasedParserBase.java
diff --git a/lib-src/org/codehaus/jackson/impl/StreamBasedParserBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/StreamBasedParserBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/StreamBasedParserBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/StreamBasedParserBase.java
diff --git a/lib-src/org/codehaus/jackson/impl/Utf8NumericParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/Utf8NumericParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/Utf8NumericParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/Utf8NumericParser.java
diff --git a/lib-src/org/codehaus/jackson/impl/Utf8StreamParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/Utf8StreamParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/Utf8StreamParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/Utf8StreamParser.java
diff --git a/lib-src/org/codehaus/jackson/impl/WriterBasedGenerator.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/WriterBasedGenerator.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/WriterBasedGenerator.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/WriterBasedGenerator.java
diff --git a/lib-src/org/codehaus/jackson/impl/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/impl/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/impl/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/impl/package-info.java
diff --git a/lib-src/org/codehaus/jackson/io/BaseReader.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/BaseReader.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/BaseReader.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/BaseReader.java
diff --git a/lib-src/org/codehaus/jackson/io/IOContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/IOContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/IOContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/IOContext.java
diff --git a/lib-src/org/codehaus/jackson/io/MergedStream.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/MergedStream.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/MergedStream.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/MergedStream.java
diff --git a/lib-src/org/codehaus/jackson/io/NumberInput.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/NumberInput.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/NumberInput.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/NumberInput.java
diff --git a/lib-src/org/codehaus/jackson/io/NumberOutput.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/NumberOutput.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/NumberOutput.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/NumberOutput.java
diff --git a/lib-src/org/codehaus/jackson/io/SegmentedStringWriter.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/SegmentedStringWriter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/SegmentedStringWriter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/SegmentedStringWriter.java
diff --git a/lib-src/org/codehaus/jackson/io/UTF32Reader.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/UTF32Reader.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/UTF32Reader.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/UTF32Reader.java
diff --git a/lib-src/org/codehaus/jackson/io/UTF8Writer.java b/XBMCRemote/lib-src/org/codehaus/jackson/io/UTF8Writer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/UTF8Writer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/UTF8Writer.java
diff --git a/lib-src/org/codehaus/jackson/io/package.html b/XBMCRemote/lib-src/org/codehaus/jackson/io/package.html
similarity index 100%
rename from lib-src/org/codehaus/jackson/io/package.html
rename to XBMCRemote/lib-src/org/codehaus/jackson/io/package.html
diff --git a/lib-src/org/codehaus/jackson/map/AnnotationIntrospector.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/AnnotationIntrospector.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/AnnotationIntrospector.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/AnnotationIntrospector.java
diff --git a/lib-src/org/codehaus/jackson/map/BeanDescription.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/BeanDescription.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/BeanDescription.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/BeanDescription.java
diff --git a/lib-src/org/codehaus/jackson/map/ClassIntrospector.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ClassIntrospector.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ClassIntrospector.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ClassIntrospector.java
diff --git a/lib-src/org/codehaus/jackson/map/DeserializationConfig.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationConfig.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/DeserializationConfig.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationConfig.java
diff --git a/lib-src/org/codehaus/jackson/map/DeserializationContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/DeserializationContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationContext.java
diff --git a/lib-src/org/codehaus/jackson/map/DeserializationProblemHandler.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationProblemHandler.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/DeserializationProblemHandler.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializationProblemHandler.java
diff --git a/lib-src/org/codehaus/jackson/map/DeserializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/DeserializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/DeserializerProvider.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializerProvider.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/DeserializerProvider.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/DeserializerProvider.java
diff --git a/lib-src/org/codehaus/jackson/map/JsonDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/JsonDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/JsonDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/JsonDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/JsonMappingException.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/JsonMappingException.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/JsonMappingException.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/JsonMappingException.java
diff --git a/lib-src/org/codehaus/jackson/map/JsonSerializable.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializable.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/JsonSerializable.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializable.java
diff --git a/lib-src/org/codehaus/jackson/map/JsonSerializableWithType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializableWithType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/JsonSerializableWithType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializableWithType.java
diff --git a/lib-src/org/codehaus/jackson/map/JsonSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/JsonSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/JsonSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/KeyDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/KeyDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/KeyDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/KeyDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/MapperConfig.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/MapperConfig.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/MapperConfig.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/MapperConfig.java
diff --git a/lib-src/org/codehaus/jackson/map/MappingJsonFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/MappingJsonFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/MappingJsonFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/MappingJsonFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/ObjectMapper.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ObjectMapper.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ObjectMapper.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ObjectMapper.java
diff --git a/lib-src/org/codehaus/jackson/map/ObjectWriter.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ObjectWriter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ObjectWriter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ObjectWriter.java
diff --git a/lib-src/org/codehaus/jackson/map/ResolvableDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ResolvableDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ResolvableDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ResolvableDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ResolvableSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ResolvableSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ResolvableSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ResolvableSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/RuntimeJsonMappingException.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/RuntimeJsonMappingException.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/RuntimeJsonMappingException.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/RuntimeJsonMappingException.java
diff --git a/lib-src/org/codehaus/jackson/map/SerializationConfig.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/SerializationConfig.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/SerializationConfig.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/SerializationConfig.java
diff --git a/lib-src/org/codehaus/jackson/map/SerializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/SerializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/SerializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/SerializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/SerializerProvider.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/SerializerProvider.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/SerializerProvider.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/SerializerProvider.java
diff --git a/lib-src/org/codehaus/jackson/map/TreeMapper.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/TreeMapper.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/TreeMapper.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/TreeMapper.java
diff --git a/lib-src/org/codehaus/jackson/map/TypeDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/TypeDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/TypeDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/TypeDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/TypeSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/TypeSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/TypeSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/TypeSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonCachable.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonCachable.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonCachable.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonCachable.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonDeserialize.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonDeserialize.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonDeserialize.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonDeserialize.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonSerialize.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonSerialize.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonSerialize.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonSerialize.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonTypeIdResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonTypeIdResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonTypeIdResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonTypeIdResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonTypeResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonTypeResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonTypeResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonTypeResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/JsonView.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonView.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/JsonView.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/JsonView.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/NoClass.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/NoClass.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/NoClass.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/NoClass.java
diff --git a/lib-src/org/codehaus/jackson/map/annotate/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/annotate/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/annotate/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/ArrayDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/ArrayDeserializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ArrayDeserializers.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/BeanDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BeanDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/BeanDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BeanDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/CollectionDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CollectionDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/CollectionDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CollectionDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/Creator.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/Creator.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/Creator.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/Creator.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/CreatorContainer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CreatorContainer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/CreatorContainer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CreatorContainer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/CustomDeserializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CustomDeserializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/CustomDeserializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/CustomDeserializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/DateDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/DateDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/DateDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/DateDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/EnumDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/EnumDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/EnumMapDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/EnumResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/EnumResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/EnumSetDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/FromStringDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/FromStringDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/FromStringDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/FromStringDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/MapDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/MapDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/MapDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/MapDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/PropertyValue.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/PropertyValue.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/PropertyValue.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/PropertyValue.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/PropertyValueBuffer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/PropertyValueBuffer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/PropertyValueBuffer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/PropertyValueBuffer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/SettableAnyProperty.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/SettableAnyProperty.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/SettableAnyProperty.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/SettableAnyProperty.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/SettableBeanProperty.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/SettableBeanProperty.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/SettableBeanProperty.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/SettableBeanProperty.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdDeserializationContext.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializationContext.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdDeserializationContext.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializationContext.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdDeserializerProvider.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdDeserializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdDeserializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdDeserializers.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdKeyDeserializers.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/StdScalarDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdScalarDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/StdScalarDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/StdScalarDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/ThrowableDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ThrowableDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/ThrowableDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/ThrowableDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/UntypedObjectDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/UntypedObjectDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/UntypedObjectDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/UntypedObjectDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/deser/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/deser/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/deser/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/deser/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/Annotated.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/Annotated.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/Annotated.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/Annotated.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedClass.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedClass.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedClass.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedClass.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedField.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedField.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedField.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedField.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMember.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMember.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedMember.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMember.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethod.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethodMap.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethodMap.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethodMap.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedMethodMap.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedParameter.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/AnnotationMap.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotationMap.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/AnnotationMap.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/AnnotationMap.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/BasicBeanDescription.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/MemberKey.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/MemberKey.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/MemberKey.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/MemberKey.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/MethodFilter.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/MethodFilter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/MethodFilter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/MethodFilter.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/VisibilityChecker.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/VisibilityChecker.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/VisibilityChecker.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/VisibilityChecker.java
diff --git a/lib-src/org/codehaus/jackson/map/introspect/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/introspect/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/introspect/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/NamedType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/NamedType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/NamedType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/NamedType.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/TypeIdResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/TypeIdResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/TypeIdResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/TypeIdResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/TypeResolverBuilder.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/TypeResolverBuilder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/TypeResolverBuilder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/TypeResolverBuilder.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeDeserializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeDeserializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeDeserializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeDeserializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/AsWrapperTypeSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/ClassNameIdResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/ClassNameIdResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/ClassNameIdResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/ClassNameIdResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/StdTypeResolverBuilder.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/StdTypeResolverBuilder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/StdTypeResolverBuilder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/StdTypeResolverBuilder.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeDeserializerBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeDeserializerBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/TypeDeserializerBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeDeserializerBase.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeIdResolverBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeIdResolverBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/TypeIdResolverBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeIdResolverBase.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeNameIdResolver.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeNameIdResolver.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/TypeNameIdResolver.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeNameIdResolver.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/impl/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/impl/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/impl/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/jsontype/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/jsontype/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/jsontype/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ArraySerializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ArraySerializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ArraySerializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ArraySerializers.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/BasicSerializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BasicSerializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/BasicSerializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BasicSerializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/BeanPropertyWriter.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/BeanSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/BeanSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/BeanSerializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ContainerSerializerBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ContainerSerializerBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ContainerSerializerBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ContainerSerializerBase.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ContainerSerializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ContainerSerializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ContainerSerializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ContainerSerializers.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/CustomSerializerFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/CustomSerializerFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/CustomSerializerFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/CustomSerializerFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/EnumMapSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/EnumMapSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/EnumMapSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/EnumMapSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/EnumSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/EnumSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/EnumSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/EnumSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/FailingSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/FailingSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/FailingSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/FailingSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/FilteredBeanPropertyWriter.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/FilteredBeanPropertyWriter.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/FilteredBeanPropertyWriter.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/FilteredBeanPropertyWriter.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/JdkSerializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/JdkSerializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/JdkSerializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/JdkSerializers.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/JsonValueSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/JsonValueSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/JsonValueSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/JsonValueSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/MapSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/MapSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/MapSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/MapSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/NullSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/NullSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/NullSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/NullSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/PropertyBuilder.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/PropertyBuilder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/PropertyBuilder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/PropertyBuilder.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ReadOnlyClassToSerializerMap.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ReadOnlyClassToSerializerMap.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ReadOnlyClassToSerializerMap.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ReadOnlyClassToSerializerMap.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ScalarSerializerBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ScalarSerializerBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ScalarSerializerBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ScalarSerializerBase.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/SerializerBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/SerializerBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/SerializerBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/SerializerBase.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/SerializerCache.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/SerializerCache.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/SerializerCache.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/SerializerCache.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/StdKeySerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdKeySerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/StdKeySerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdKeySerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/StdSerializerProvider.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdSerializerProvider.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/StdSerializerProvider.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdSerializerProvider.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/StdSerializers.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdSerializers.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/StdSerializers.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/StdSerializers.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/ToStringSerializer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ToStringSerializer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/ToStringSerializer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/ToStringSerializer.java
diff --git a/lib-src/org/codehaus/jackson/map/ser/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/ser/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/ser/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/ser/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/type/ArrayType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/ArrayType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/ArrayType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/ArrayType.java
diff --git a/lib-src/org/codehaus/jackson/map/type/ClassKey.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/ClassKey.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/ClassKey.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/ClassKey.java
diff --git a/lib-src/org/codehaus/jackson/map/type/CollectionType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/CollectionType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/CollectionType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/CollectionType.java
diff --git a/lib-src/org/codehaus/jackson/map/type/MapType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/MapType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/MapType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/MapType.java
diff --git a/lib-src/org/codehaus/jackson/map/type/SimpleType.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/SimpleType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/SimpleType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/SimpleType.java
diff --git a/lib-src/org/codehaus/jackson/map/type/TypeBase.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeBase.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/TypeBase.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeBase.java
diff --git a/lib-src/org/codehaus/jackson/map/type/TypeBindings.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeBindings.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/TypeBindings.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeBindings.java
diff --git a/lib-src/org/codehaus/jackson/map/type/TypeFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/TypeFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeFactory.java
diff --git a/lib-src/org/codehaus/jackson/map/type/TypeParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/TypeParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/TypeParser.java
diff --git a/lib-src/org/codehaus/jackson/map/type/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/type/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/type/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/type/package-info.java
diff --git a/lib-src/org/codehaus/jackson/map/util/ArrayBuilders.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/ArrayBuilders.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/ArrayBuilders.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/ArrayBuilders.java
diff --git a/lib-src/org/codehaus/jackson/map/util/ClassUtil.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/ClassUtil.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/ClassUtil.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/ClassUtil.java
diff --git a/lib-src/org/codehaus/jackson/map/util/EnumValues.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/EnumValues.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/EnumValues.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/EnumValues.java
diff --git a/lib-src/org/codehaus/jackson/map/util/JSONPObject.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/JSONPObject.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/JSONPObject.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/JSONPObject.java
diff --git a/lib-src/org/codehaus/jackson/map/util/JSONWrappedObject.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/JSONWrappedObject.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/JSONWrappedObject.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/JSONWrappedObject.java
diff --git a/lib-src/org/codehaus/jackson/map/util/LinkedNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/LinkedNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/LinkedNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/LinkedNode.java
diff --git a/lib-src/org/codehaus/jackson/map/util/ObjectBuffer.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/ObjectBuffer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/ObjectBuffer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/ObjectBuffer.java
diff --git a/lib-src/org/codehaus/jackson/map/util/PrimitiveArrayBuilder.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/PrimitiveArrayBuilder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/PrimitiveArrayBuilder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/PrimitiveArrayBuilder.java
diff --git a/lib-src/org/codehaus/jackson/map/util/Provider.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/Provider.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/Provider.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/Provider.java
diff --git a/lib-src/org/codehaus/jackson/map/util/StdDateFormat.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/StdDateFormat.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/StdDateFormat.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/StdDateFormat.java
diff --git a/lib-src/org/codehaus/jackson/map/util/SubTypeHelper.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/SubTypeHelper.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/SubTypeHelper.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/SubTypeHelper.java
diff --git a/lib-src/org/codehaus/jackson/map/util/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/map/util/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/map/util/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/map/util/package-info.java
diff --git a/lib-src/org/codehaus/jackson/node/ArrayNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/ArrayNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/ArrayNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/ArrayNode.java
diff --git a/lib-src/org/codehaus/jackson/node/BaseJsonNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/BaseJsonNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/BaseJsonNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/BaseJsonNode.java
diff --git a/lib-src/org/codehaus/jackson/node/BigIntegerNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/BigIntegerNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/BigIntegerNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/BigIntegerNode.java
diff --git a/lib-src/org/codehaus/jackson/node/BinaryNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/BinaryNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/BinaryNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/BinaryNode.java
diff --git a/lib-src/org/codehaus/jackson/node/BooleanNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/BooleanNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/BooleanNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/BooleanNode.java
diff --git a/lib-src/org/codehaus/jackson/node/ContainerNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/ContainerNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/ContainerNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/ContainerNode.java
diff --git a/lib-src/org/codehaus/jackson/node/DecimalNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/DecimalNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/DecimalNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/DecimalNode.java
diff --git a/lib-src/org/codehaus/jackson/node/DoubleNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/DoubleNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/DoubleNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/DoubleNode.java
diff --git a/lib-src/org/codehaus/jackson/node/IntNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/IntNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/IntNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/IntNode.java
diff --git a/lib-src/org/codehaus/jackson/node/JsonNodeFactory.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/JsonNodeFactory.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/JsonNodeFactory.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/JsonNodeFactory.java
diff --git a/lib-src/org/codehaus/jackson/node/LongNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/LongNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/LongNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/LongNode.java
diff --git a/lib-src/org/codehaus/jackson/node/MissingNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/MissingNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/MissingNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/MissingNode.java
diff --git a/lib-src/org/codehaus/jackson/node/NodeCursor.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/NodeCursor.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/NodeCursor.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/NodeCursor.java
diff --git a/lib-src/org/codehaus/jackson/node/NullNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/NullNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/NullNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/NullNode.java
diff --git a/lib-src/org/codehaus/jackson/node/NumericNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/NumericNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/NumericNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/NumericNode.java
diff --git a/lib-src/org/codehaus/jackson/node/ObjectNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/ObjectNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/ObjectNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/ObjectNode.java
diff --git a/lib-src/org/codehaus/jackson/node/POJONode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/POJONode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/POJONode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/POJONode.java
diff --git a/lib-src/org/codehaus/jackson/node/TextNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/TextNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/TextNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/TextNode.java
diff --git a/lib-src/org/codehaus/jackson/node/TreeTraversingParser.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/TreeTraversingParser.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/TreeTraversingParser.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/TreeTraversingParser.java
diff --git a/lib-src/org/codehaus/jackson/node/ValueNode.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/ValueNode.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/ValueNode.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/ValueNode.java
diff --git a/lib-src/org/codehaus/jackson/node/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/node/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/node/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/node/package-info.java
diff --git a/lib-src/org/codehaus/jackson/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/package-info.java
diff --git a/lib-src/org/codehaus/jackson/schema/JsonSchema.java b/XBMCRemote/lib-src/org/codehaus/jackson/schema/JsonSchema.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/schema/JsonSchema.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/schema/JsonSchema.java
diff --git a/lib-src/org/codehaus/jackson/schema/JsonSerializableSchema.java b/XBMCRemote/lib-src/org/codehaus/jackson/schema/JsonSerializableSchema.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/schema/JsonSerializableSchema.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/schema/JsonSerializableSchema.java
diff --git a/lib-src/org/codehaus/jackson/schema/SchemaAware.java b/XBMCRemote/lib-src/org/codehaus/jackson/schema/SchemaAware.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/schema/SchemaAware.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/schema/SchemaAware.java
diff --git a/lib-src/org/codehaus/jackson/schema/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/schema/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/schema/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/schema/package-info.java
diff --git a/lib-src/org/codehaus/jackson/sym/BytesToNameCanonicalizer.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/BytesToNameCanonicalizer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/BytesToNameCanonicalizer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/BytesToNameCanonicalizer.java
diff --git a/lib-src/org/codehaus/jackson/sym/CharsToNameCanonicalizer.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/CharsToNameCanonicalizer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/CharsToNameCanonicalizer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/CharsToNameCanonicalizer.java
diff --git a/lib-src/org/codehaus/jackson/sym/Name.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/Name.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/Name.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/Name.java
diff --git a/lib-src/org/codehaus/jackson/sym/Name1.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/Name1.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/Name1.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/Name1.java
diff --git a/lib-src/org/codehaus/jackson/sym/Name2.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/Name2.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/Name2.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/Name2.java
diff --git a/lib-src/org/codehaus/jackson/sym/Name3.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/Name3.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/Name3.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/Name3.java
diff --git a/lib-src/org/codehaus/jackson/sym/NameN.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/NameN.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/NameN.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/NameN.java
diff --git a/lib-src/org/codehaus/jackson/sym/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/sym/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/sym/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/sym/package-info.java
diff --git a/lib-src/org/codehaus/jackson/type/JavaType.java b/XBMCRemote/lib-src/org/codehaus/jackson/type/JavaType.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/type/JavaType.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/type/JavaType.java
diff --git a/lib-src/org/codehaus/jackson/type/TypeReference.java b/XBMCRemote/lib-src/org/codehaus/jackson/type/TypeReference.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/type/TypeReference.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/type/TypeReference.java
diff --git a/lib-src/org/codehaus/jackson/type/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/type/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/type/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/type/package-info.java
diff --git a/lib-src/org/codehaus/jackson/util/BufferRecycler.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/BufferRecycler.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/BufferRecycler.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/BufferRecycler.java
diff --git a/lib-src/org/codehaus/jackson/util/ByteArrayBuilder.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/ByteArrayBuilder.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/ByteArrayBuilder.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/ByteArrayBuilder.java
diff --git a/lib-src/org/codehaus/jackson/util/CharTypes.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/CharTypes.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/CharTypes.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/CharTypes.java
diff --git a/lib-src/org/codehaus/jackson/util/InternCache.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/InternCache.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/InternCache.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/InternCache.java
diff --git a/lib-src/org/codehaus/jackson/util/JsonGeneratorDelegate.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/JsonGeneratorDelegate.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/JsonGeneratorDelegate.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/JsonGeneratorDelegate.java
diff --git a/lib-src/org/codehaus/jackson/util/JsonParserDelegate.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/JsonParserDelegate.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/JsonParserDelegate.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/JsonParserDelegate.java
diff --git a/lib-src/org/codehaus/jackson/util/JsonParserSequence.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/JsonParserSequence.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/JsonParserSequence.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/JsonParserSequence.java
diff --git a/lib-src/org/codehaus/jackson/util/TextBuffer.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/TextBuffer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/TextBuffer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/TextBuffer.java
diff --git a/lib-src/org/codehaus/jackson/util/TokenBuffer.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/TokenBuffer.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/TokenBuffer.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/TokenBuffer.java
diff --git a/lib-src/org/codehaus/jackson/util/package-info.java b/XBMCRemote/lib-src/org/codehaus/jackson/util/package-info.java
similarity index 100%
rename from lib-src/org/codehaus/jackson/util/package-info.java
rename to XBMCRemote/lib-src/org/codehaus/jackson/util/package-info.java
diff --git a/lib/jmdns.jar b/XBMCRemote/lib/jmdns.jar
similarity index 100%
rename from lib/jmdns.jar
rename to XBMCRemote/lib/jmdns.jar
diff --git a/proguard.cfg b/XBMCRemote/proguard.cfg
similarity index 100%
rename from proguard.cfg
rename to XBMCRemote/proguard.cfg
diff --git a/res/anim/slide_left.xml b/XBMCRemote/res/anim/slide_left.xml
similarity index 100%
rename from res/anim/slide_left.xml
rename to XBMCRemote/res/anim/slide_left.xml
diff --git a/res/anim/slide_right.xml b/XBMCRemote/res/anim/slide_right.xml
similarity index 100%
rename from res/anim/slide_right.xml
rename to XBMCRemote/res/anim/slide_right.xml
diff --git a/res/drawable-hdpi-v4/about_back.png b/XBMCRemote/res/drawable-hdpi-v4/about_back.png
similarity index 100%
rename from res/drawable-hdpi-v4/about_back.png
rename to XBMCRemote/res/drawable-hdpi-v4/about_back.png
diff --git a/res/drawable-hdpi-v4/bottom_logo_down.png b/XBMCRemote/res/drawable-hdpi-v4/bottom_logo_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/bottom_logo_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/bottom_logo_down.png
diff --git a/res/drawable-hdpi-v4/bottom_logo_up.png b/XBMCRemote/res/drawable-hdpi-v4/bottom_logo_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/bottom_logo_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/bottom_logo_up.png
diff --git a/res/drawable-hdpi-v4/bottom_text_down.9.png b/XBMCRemote/res/drawable-hdpi-v4/bottom_text_down.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/bottom_text_down.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/bottom_text_down.9.png
diff --git a/res/drawable-hdpi-v4/bottom_text_up.9.png b/XBMCRemote/res/drawable-hdpi-v4/bottom_text_up.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/bottom_text_up.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/bottom_text_up.9.png
diff --git a/res/drawable-hdpi-v4/bottombar_bg.png b/XBMCRemote/res/drawable-hdpi-v4/bottombar_bg.png
similarity index 100%
rename from res/drawable-hdpi-v4/bottombar_bg.png
rename to XBMCRemote/res/drawable-hdpi-v4/bottombar_bg.png
diff --git a/res/drawable-hdpi-v4/bubble_add.png b/XBMCRemote/res/drawable-hdpi-v4/bubble_add.png
similarity index 100%
rename from res/drawable-hdpi-v4/bubble_add.png
rename to XBMCRemote/res/drawable-hdpi-v4/bubble_add.png
diff --git a/res/drawable-hdpi-v4/bubble_del_down.png b/XBMCRemote/res/drawable-hdpi-v4/bubble_del_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/bubble_del_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/bubble_del_down.png
diff --git a/res/drawable-hdpi-v4/bubble_del_up.png b/XBMCRemote/res/drawable-hdpi-v4/bubble_del_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/bubble_del_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/bubble_del_up.png
diff --git a/res/drawable-hdpi-v4/coverbox_back.png b/XBMCRemote/res/drawable-hdpi-v4/coverbox_back.png
similarity index 100%
rename from res/drawable-hdpi-v4/coverbox_back.png
rename to XBMCRemote/res/drawable-hdpi-v4/coverbox_back.png
diff --git a/res/drawable-hdpi-v4/default_album.png b/XBMCRemote/res/drawable-hdpi-v4/default_album.png
similarity index 100%
rename from res/drawable-hdpi-v4/default_album.png
rename to XBMCRemote/res/drawable-hdpi-v4/default_album.png
diff --git a/res/drawable-hdpi-v4/default_jewel.png b/XBMCRemote/res/drawable-hdpi-v4/default_jewel.png
similarity index 100%
rename from res/drawable-hdpi-v4/default_jewel.png
rename to XBMCRemote/res/drawable-hdpi-v4/default_jewel.png
diff --git a/res/drawable-hdpi-v4/default_poster.png b/XBMCRemote/res/drawable-hdpi-v4/default_poster.png
similarity index 100%
rename from res/drawable-hdpi-v4/default_poster.png
rename to XBMCRemote/res/drawable-hdpi-v4/default_poster.png
diff --git a/res/drawable-hdpi-v4/default_season.png b/XBMCRemote/res/drawable-hdpi-v4/default_season.png
similarity index 100%
rename from res/drawable-hdpi-v4/default_season.png
rename to XBMCRemote/res/drawable-hdpi-v4/default_season.png
diff --git a/res/drawable-hdpi-v4/default_tvshow.png b/XBMCRemote/res/drawable-hdpi-v4/default_tvshow.png
similarity index 100%
rename from res/drawable-hdpi-v4/default_tvshow.png
rename to XBMCRemote/res/drawable-hdpi-v4/default_tvshow.png
diff --git a/res/drawable-hdpi-v4/icon.png b/XBMCRemote/res/drawable-hdpi-v4/icon.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon.png
diff --git a/res/drawable-hdpi-v4/icon_album.png b/XBMCRemote/res/drawable-hdpi-v4/icon_album.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_album.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_album.png
diff --git a/res/drawable-hdpi-v4/icon_album_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_album_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_album_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_album_dark.png
diff --git a/res/drawable-hdpi-v4/icon_album_dark_big.png b/XBMCRemote/res/drawable-hdpi-v4/icon_album_dark_big.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_album_dark_big.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_album_dark_big.png
diff --git a/res/drawable-hdpi-v4/icon_artist.png b/XBMCRemote/res/drawable-hdpi-v4/icon_artist.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_artist.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_artist.png
diff --git a/res/drawable-hdpi-v4/icon_artist_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_artist_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_artist_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_artist_dark.png
diff --git a/res/drawable-hdpi-v4/icon_file.png b/XBMCRemote/res/drawable-hdpi-v4/icon_file.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_file.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_file.png
diff --git a/res/drawable-hdpi-v4/icon_folder.png b/XBMCRemote/res/drawable-hdpi-v4/icon_folder.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_folder.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_folder.png
diff --git a/res/drawable-hdpi-v4/icon_folder_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_folder_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_folder_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_folder_dark.png
diff --git a/res/drawable-hdpi-v4/icon_genre.png b/XBMCRemote/res/drawable-hdpi-v4/icon_genre.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_genre.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_genre.png
diff --git a/res/drawable-hdpi-v4/icon_genre_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_genre_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_genre_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_genre_dark.png
diff --git a/res/drawable-hdpi-v4/icon_home_movie.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_movie.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_movie.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_movie.png
diff --git a/res/drawable-hdpi-v4/icon_home_music.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_music.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_music.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_music.png
diff --git a/res/drawable-hdpi-v4/icon_home_picture.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_picture.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_picture.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_picture.png
diff --git a/res/drawable-hdpi-v4/icon_home_playing.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_playing.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_playing.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_playing.png
diff --git a/res/drawable-hdpi-v4/icon_home_power.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_power.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_power.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_power.png
diff --git a/res/drawable-hdpi-v4/icon_home_reconnect.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_reconnect.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_reconnect.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_reconnect.png
diff --git a/res/drawable-hdpi-v4/icon_home_remote.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_remote.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_remote.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_remote.png
diff --git a/res/drawable-hdpi-v4/icon_home_tv.png b/XBMCRemote/res/drawable-hdpi-v4/icon_home_tv.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_home_tv.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_home_tv.png
diff --git a/res/drawable-hdpi-v4/icon_lastfm.png b/XBMCRemote/res/drawable-hdpi-v4/icon_lastfm.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_lastfm.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_lastfm.png
diff --git a/res/drawable-hdpi-v4/icon_movie_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_movie_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_movie_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_movie_dark.png
diff --git a/res/drawable-hdpi-v4/icon_picture.png b/XBMCRemote/res/drawable-hdpi-v4/icon_picture.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_picture.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_picture.png
diff --git a/res/drawable-hdpi-v4/icon_play.png b/XBMCRemote/res/drawable-hdpi-v4/icon_play.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_play.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_play.png
diff --git a/res/drawable-hdpi-v4/icon_playlist_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_playlist_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_playlist_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_playlist_dark.png
diff --git a/res/drawable-hdpi-v4/icon_shoutcast.png b/XBMCRemote/res/drawable-hdpi-v4/icon_shoutcast.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_shoutcast.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_shoutcast.png
diff --git a/res/drawable-hdpi-v4/icon_song.png b/XBMCRemote/res/drawable-hdpi-v4/icon_song.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_song.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_song.png
diff --git a/res/drawable-hdpi-v4/icon_song_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_song_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_song_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_song_dark.png
diff --git a/res/drawable-hdpi-v4/icon_song_light.png b/XBMCRemote/res/drawable-hdpi-v4/icon_song_light.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_song_light.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_song_light.png
diff --git a/res/drawable-hdpi-v4/icon_va_dark.png b/XBMCRemote/res/drawable-hdpi-v4/icon_va_dark.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_va_dark.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_va_dark.png
diff --git a/res/drawable-hdpi-v4/icon_video.png b/XBMCRemote/res/drawable-hdpi-v4/icon_video.png
similarity index 100%
rename from res/drawable-hdpi-v4/icon_video.png
rename to XBMCRemote/res/drawable-hdpi-v4/icon_video.png
diff --git a/res/drawable-hdpi-v4/jewel_cd.9.png b/XBMCRemote/res/drawable-hdpi-v4/jewel_cd.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/jewel_cd.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/jewel_cd.9.png
diff --git a/res/drawable-hdpi-v4/jewel_dvd.9.png b/XBMCRemote/res/drawable-hdpi-v4/jewel_dvd.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/jewel_dvd.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/jewel_dvd.9.png
diff --git a/res/drawable-hdpi-v4/jewel_tv.9.png b/XBMCRemote/res/drawable-hdpi-v4/jewel_tv.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/jewel_tv.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/jewel_tv.9.png
diff --git a/res/drawable-hdpi-v4/layout_top_bar.9.png b/XBMCRemote/res/drawable-hdpi-v4/layout_top_bar.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/layout_top_bar.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/layout_top_bar.9.png
diff --git a/res/drawable-hdpi-v4/menu_about.png b/XBMCRemote/res/drawable-hdpi-v4/menu_about.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_about.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_about.png
diff --git a/res/drawable-hdpi-v4/menu_add_host.png b/XBMCRemote/res/drawable-hdpi-v4/menu_add_host.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_add_host.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_add_host.png
diff --git a/res/drawable-hdpi-v4/menu_album.png b/XBMCRemote/res/drawable-hdpi-v4/menu_album.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_album.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_album.png
diff --git a/res/drawable-hdpi-v4/menu_download.png b/XBMCRemote/res/drawable-hdpi-v4/menu_download.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_download.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_download.png
diff --git a/res/drawable-hdpi-v4/menu_exit.png b/XBMCRemote/res/drawable-hdpi-v4/menu_exit.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_exit.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_exit.png
diff --git a/res/drawable-hdpi-v4/menu_gesture_mode.png b/XBMCRemote/res/drawable-hdpi-v4/menu_gesture_mode.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_gesture_mode.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_gesture_mode.png
diff --git a/res/drawable-hdpi-v4/menu_hide_watched.png b/XBMCRemote/res/drawable-hdpi-v4/menu_hide_watched.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_hide_watched.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_hide_watched.png
diff --git a/res/drawable-hdpi-v4/menu_nowplaying.png b/XBMCRemote/res/drawable-hdpi-v4/menu_nowplaying.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_nowplaying.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_nowplaying.png
diff --git a/res/drawable-hdpi-v4/menu_refresh.png b/XBMCRemote/res/drawable-hdpi-v4/menu_refresh.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_refresh.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_refresh.png
diff --git a/res/drawable-hdpi-v4/menu_remote.png b/XBMCRemote/res/drawable-hdpi-v4/menu_remote.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_remote.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_remote.png
diff --git a/res/drawable-hdpi-v4/menu_settings.png b/XBMCRemote/res/drawable-hdpi-v4/menu_settings.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_settings.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_settings.png
diff --git a/res/drawable-hdpi-v4/menu_show_watched.png b/XBMCRemote/res/drawable-hdpi-v4/menu_show_watched.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_show_watched.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_show_watched.png
diff --git a/res/drawable-hdpi-v4/menu_song.png b/XBMCRemote/res/drawable-hdpi-v4/menu_song.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_song.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_song.png
diff --git a/res/drawable-hdpi-v4/menu_sort.png b/XBMCRemote/res/drawable-hdpi-v4/menu_sort.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_sort.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_sort.png
diff --git a/res/drawable-hdpi-v4/menu_switch.png b/XBMCRemote/res/drawable-hdpi-v4/menu_switch.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_switch.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_switch.png
diff --git a/res/drawable-hdpi-v4/menu_view.png b/XBMCRemote/res/drawable-hdpi-v4/menu_view.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_view.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_view.png
diff --git a/res/drawable-hdpi-v4/menu_xbmc_exit.png b/XBMCRemote/res/drawable-hdpi-v4/menu_xbmc_exit.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_xbmc_exit.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_xbmc_exit.png
diff --git a/res/drawable-hdpi-v4/menu_xbmc_s.png b/XBMCRemote/res/drawable-hdpi-v4/menu_xbmc_s.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_xbmc_s.png
rename to XBMCRemote/res/drawable-hdpi-v4/menu_xbmc_s.png
diff --git a/res/drawable-hdpi-v4/now_playing_next_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_next_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_next_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_next_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_next_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_next_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_next_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_next_up.png
diff --git a/res/drawable-hdpi-v4/now_playing_pause_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_pause_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_pause_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_pause_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_pause_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_pause_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_pause_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_pause_up.png
diff --git a/res/drawable-hdpi-v4/now_playing_play_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_play_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_play_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_play_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_play_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_play_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_play_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_play_up.png
diff --git a/res/drawable-hdpi-v4/now_playing_playlist_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_playlist_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_playlist_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_playlist_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_playlist_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_playlist_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_playlist_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_playlist_up.png
diff --git a/res/drawable-hdpi-v4/now_playing_previous_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_previous_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_previous_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_previous_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_previous_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_previous_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_previous_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_previous_up.png
diff --git a/res/drawable-hdpi-v4/now_playing_stop_down.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_stop_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_stop_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_stop_down.png
diff --git a/res/drawable-hdpi-v4/now_playing_stop_up.png b/XBMCRemote/res/drawable-hdpi-v4/now_playing_stop_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/now_playing_stop_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/now_playing_stop_up.png
diff --git a/res/drawable-hdpi-v4/pgbar_act.png b/XBMCRemote/res/drawable-hdpi-v4/pgbar_act.png
similarity index 100%
rename from res/drawable-hdpi-v4/pgbar_act.png
rename to XBMCRemote/res/drawable-hdpi-v4/pgbar_act.png
diff --git a/res/drawable-hdpi-v4/pgbar_thumb.png b/XBMCRemote/res/drawable-hdpi-v4/pgbar_thumb.png
similarity index 100%
rename from res/drawable-hdpi-v4/pgbar_thumb.png
rename to XBMCRemote/res/drawable-hdpi-v4/pgbar_thumb.png
diff --git a/res/drawable-hdpi-v4/playlist_rightboxes.png b/XBMCRemote/res/drawable-hdpi-v4/playlist_rightboxes.png
similarity index 100%
rename from res/drawable-hdpi-v4/playlist_rightboxes.png
rename to XBMCRemote/res/drawable-hdpi-v4/playlist_rightboxes.png
diff --git a/res/drawable-hdpi-v4/remote_gest_cursor.png b/XBMCRemote/res/drawable-hdpi-v4/remote_gest_cursor.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_gest_cursor.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_gest_cursor.png
diff --git a/res/drawable-hdpi-v4/remote_xbox__top_left.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox__top_left.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox__top_left.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox__top_left.png
diff --git a/res/drawable-hdpi-v4/remote_xbox__top_right.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox__top_right.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox__top_right.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox__top_right.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_back.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_back.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_back_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_back_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_back_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_display.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_display.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_display_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_display_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_display_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_display_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_display_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_down.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_down.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_down_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_down_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_down_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesture_back_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_back_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesture_back_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_back_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesture_info_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_info_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesture_info_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_info_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesture_menu_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_menu_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesture_menu_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_menu_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesture_title_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_title_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesture_title_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesture_title_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesturezone.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesturezone.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesturezone.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesturezone.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_gesturezone_dim.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesturezone_dim.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_gesturezone_dim.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_gesturezone_dim.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_images.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_images.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_images_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_images_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_images_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_images_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_images_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_info.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_info.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_info_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_info_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_info_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_left.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_left.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_left_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_left_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_left_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_menu.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_menu.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_menu_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_menu_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_menu_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_music.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_music.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_music_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_music_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_music_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_music_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_music_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_next.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_next.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_next_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_next_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_next_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_pause.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_pause.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_pause_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_pause_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_pause_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_play.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_play.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_play_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_play_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_play_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_previous.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_previous.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_previous_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_previous_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_previous_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_right.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_right.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_right_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_right_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_right_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_back.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_back.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_back_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_forward.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_forward.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_seek_forward_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_select.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_select.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_select_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_select_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_select_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_stop.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_stop.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_stop_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_stop_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_stop_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_title.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_title.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_title_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_title_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_title_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_tv.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_tv.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_tv_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_tv_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_tv_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_tv_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_tv_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_up.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_up.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_up_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_up_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_up_up.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_video.xml b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video.xml
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_video.xml
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video.xml
diff --git a/res/drawable-hdpi-v4/remote_xbox_video_down.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video_down.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_video_down.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video_down.png
diff --git a/res/drawable-hdpi-v4/remote_xbox_video_up.png b/XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video_up.png
similarity index 100%
rename from res/drawable-hdpi-v4/remote_xbox_video_up.png
rename to XBMCRemote/res/drawable-hdpi-v4/remote_xbox_video_up.png
diff --git a/res/drawable-hdpi-v4/scrollbar_handle.png b/XBMCRemote/res/drawable-hdpi-v4/scrollbar_handle.png
similarity index 100%
rename from res/drawable-hdpi-v4/scrollbar_handle.png
rename to XBMCRemote/res/drawable-hdpi-v4/scrollbar_handle.png
diff --git a/res/drawable-hdpi-v4/shiny_black_back.png b/XBMCRemote/res/drawable-hdpi-v4/shiny_black_back.png
similarity index 100%
rename from res/drawable-hdpi-v4/shiny_black_back.png
rename to XBMCRemote/res/drawable-hdpi-v4/shiny_black_back.png
diff --git a/res/drawable-hdpi-v4/st_actor_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_actor_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_actor_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_actor_off.png
diff --git a/res/drawable-hdpi-v4/st_actor_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_actor_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_actor_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_actor_on.png
diff --git a/res/drawable-hdpi-v4/st_actor_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_actor_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_actor_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_actor_over.png
diff --git a/res/drawable-hdpi-v4/st_album_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_album_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_album_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_album_off.png
diff --git a/res/drawable-hdpi-v4/st_album_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_album_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_album_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_album_on.png
diff --git a/res/drawable-hdpi-v4/st_album_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_album_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_album_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_album_over.png
diff --git a/res/drawable-hdpi-v4/st_artist_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_artist_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_artist_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_artist_off.png
diff --git a/res/drawable-hdpi-v4/st_artist_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_artist_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_artist_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_artist_on.png
diff --git a/res/drawable-hdpi-v4/st_artist_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_artist_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_artist_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_artist_over.png
diff --git a/res/drawable-hdpi-v4/st_background.png b/XBMCRemote/res/drawable-hdpi-v4/st_background.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_background.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_background.png
diff --git a/res/drawable-hdpi-v4/st_filemode_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_filemode_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_filemode_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_filemode_off.png
diff --git a/res/drawable-hdpi-v4/st_filemode_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_filemode_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_filemode_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_filemode_on.png
diff --git a/res/drawable-hdpi-v4/st_filemode_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_filemode_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_filemode_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_filemode_over.png
diff --git a/res/drawable-hdpi-v4/st_genre_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_genre_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_genre_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_genre_off.png
diff --git a/res/drawable-hdpi-v4/st_genre_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_genre_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_genre_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_genre_on.png
diff --git a/res/drawable-hdpi-v4/st_genre_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_genre_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_genre_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_genre_over.png
diff --git a/res/drawable-hdpi-v4/st_movie_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_movie_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_movie_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_movie_off.png
diff --git a/res/drawable-hdpi-v4/st_movie_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_movie_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_movie_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_movie_on.png
diff --git a/res/drawable-hdpi-v4/st_movie_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_movie_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_movie_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_movie_over.png
diff --git a/res/drawable-hdpi-v4/st_playlist_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_playlist_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_playlist_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_playlist_off.png
diff --git a/res/drawable-hdpi-v4/st_playlist_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_playlist_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_playlist_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_playlist_on.png
diff --git a/res/drawable-hdpi-v4/st_playlist_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_playlist_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_playlist_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_playlist_over.png
diff --git a/res/drawable-hdpi-v4/st_slider.png b/XBMCRemote/res/drawable-hdpi-v4/st_slider.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_slider.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_slider.png
diff --git a/res/drawable-hdpi-v4/st_song_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_song_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_song_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_song_off.png
diff --git a/res/drawable-hdpi-v4/st_song_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_song_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_song_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_song_on.png
diff --git a/res/drawable-hdpi-v4/st_song_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_song_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_song_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_song_over.png
diff --git a/res/drawable-hdpi-v4/st_tv_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_tv_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_tv_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_tv_off.png
diff --git a/res/drawable-hdpi-v4/st_tv_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_tv_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_tv_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_tv_on.png
diff --git a/res/drawable-hdpi-v4/st_tv_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_tv_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_tv_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_tv_over.png
diff --git a/res/drawable-hdpi-v4/st_va_off.png b/XBMCRemote/res/drawable-hdpi-v4/st_va_off.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_va_off.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_va_off.png
diff --git a/res/drawable-hdpi-v4/st_va_on.png b/XBMCRemote/res/drawable-hdpi-v4/st_va_on.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_va_on.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_va_on.png
diff --git a/res/drawable-hdpi-v4/st_va_over.png b/XBMCRemote/res/drawable-hdpi-v4/st_va_over.png
similarity index 100%
rename from res/drawable-hdpi-v4/st_va_over.png
rename to XBMCRemote/res/drawable-hdpi-v4/st_va_over.png
diff --git a/res/drawable-hdpi-v4/stars_0.png b/XBMCRemote/res/drawable-hdpi-v4/stars_0.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_0.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_0.png
diff --git a/res/drawable-hdpi-v4/stars_1.png b/XBMCRemote/res/drawable-hdpi-v4/stars_1.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_1.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_1.png
diff --git a/res/drawable-hdpi-v4/stars_10.png b/XBMCRemote/res/drawable-hdpi-v4/stars_10.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_10.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_10.png
diff --git a/res/drawable-hdpi-v4/stars_2.png b/XBMCRemote/res/drawable-hdpi-v4/stars_2.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_2.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_2.png
diff --git a/res/drawable-hdpi-v4/stars_3.png b/XBMCRemote/res/drawable-hdpi-v4/stars_3.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_3.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_3.png
diff --git a/res/drawable-hdpi-v4/stars_4.png b/XBMCRemote/res/drawable-hdpi-v4/stars_4.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_4.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_4.png
diff --git a/res/drawable-hdpi-v4/stars_5.png b/XBMCRemote/res/drawable-hdpi-v4/stars_5.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_5.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_5.png
diff --git a/res/drawable-hdpi-v4/stars_6.png b/XBMCRemote/res/drawable-hdpi-v4/stars_6.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_6.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_6.png
diff --git a/res/drawable-hdpi-v4/stars_7.png b/XBMCRemote/res/drawable-hdpi-v4/stars_7.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_7.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_7.png
diff --git a/res/drawable-hdpi-v4/stars_8.png b/XBMCRemote/res/drawable-hdpi-v4/stars_8.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_8.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_8.png
diff --git a/res/drawable-hdpi-v4/stars_9.png b/XBMCRemote/res/drawable-hdpi-v4/stars_9.png
similarity index 100%
rename from res/drawable-hdpi-v4/stars_9.png
rename to XBMCRemote/res/drawable-hdpi-v4/stars_9.png
diff --git a/res/drawable-hdpi-v4/timeborder.9.png b/XBMCRemote/res/drawable-hdpi-v4/timeborder.9.png
similarity index 100%
rename from res/drawable-hdpi-v4/timeborder.9.png
rename to XBMCRemote/res/drawable-hdpi-v4/timeborder.9.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_back_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_back_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_back_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_back_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_display_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_display_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_display_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_display_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_display_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_display_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_display_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_display_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_down_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_down_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_down_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_down_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_images_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_images_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_images_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_images_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_images_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_images_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_images_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_images_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_info_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_info_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_info_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_info_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_left_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_left_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_left_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_left_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_menu_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_menu_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_menu_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_menu_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_music_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_music_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_music_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_music_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_music_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_music_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_music_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_music_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_next_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_next_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_next_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_next_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_pause_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_pause_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_pause_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_pause_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_play_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_play_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_play_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_play_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_power_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_power_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_power_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_power_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_power_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_power_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_power_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_power_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_previous_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_previous_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_previous_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_previous_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_right_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_right_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_right_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_right_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_back_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_back_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_seek_forward_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_select_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_select_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_select_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_select_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_stop_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_stop_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_stop_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_stop_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_title_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_title_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_title_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_title_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_tv_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_tv_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_tv_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_tv_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_tv_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_tv_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_tv_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_tv_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_up_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_up_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_up_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_up_up.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_video_down.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_video_down.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_video_down.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_video_down.png
diff --git a/res/drawable-land-hdpi-v4/remote_xbox_video_up.png b/XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_video_up.png
similarity index 100%
rename from res/drawable-land-hdpi-v4/remote_xbox_video_up.png
rename to XBMCRemote/res/drawable-land-hdpi-v4/remote_xbox_video_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_back_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_back_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_back_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_back_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_down_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_down_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_down_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_down_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_info_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_info_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_info_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_info_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_left_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_left_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_left_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_left_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_menu_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_menu_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_menu_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_menu_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_next_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_next_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_next_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_next_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_pause_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_pause_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_pause_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_pause_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_play_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_play_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_play_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_play_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_power_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_power_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_power_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_power_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_power_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_power_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_power_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_power_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_previous_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_previous_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_previous_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_previous_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_right_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_right_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_right_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_right_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_back_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_back_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_seek_forward_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_select_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_select_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_select_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_select_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_stop_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_stop_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_stop_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_stop_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_title_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_title_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_title_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_title_up.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_up_down.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_up_down.png
diff --git a/res/drawable-land-ldpi-v4/remote_xbox_up_up.png b/XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable-land-ldpi-v4/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable-land-ldpi-v4/remote_xbox_up_up.png
diff --git a/res/drawable-land/remote_xbox_back.xml b/XBMCRemote/res/drawable-land/remote_xbox_back.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_back.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_back.xml
diff --git a/res/drawable-land/remote_xbox_back_down.png b/XBMCRemote/res/drawable-land/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_back_down.png
diff --git a/res/drawable-land/remote_xbox_back_up.png b/XBMCRemote/res/drawable-land/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_back_up.png
diff --git a/res/drawable-land/remote_xbox_display.xml b/XBMCRemote/res/drawable-land/remote_xbox_display.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_display.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_display.xml
diff --git a/res/drawable-land/remote_xbox_display_down.png b/XBMCRemote/res/drawable-land/remote_xbox_display_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_display_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_display_down.png
diff --git a/res/drawable-land/remote_xbox_display_up.png b/XBMCRemote/res/drawable-land/remote_xbox_display_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_display_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_display_up.png
diff --git a/res/drawable-land/remote_xbox_down.xml b/XBMCRemote/res/drawable-land/remote_xbox_down.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_down.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_down.xml
diff --git a/res/drawable-land/remote_xbox_down_down.png b/XBMCRemote/res/drawable-land/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_down_down.png
diff --git a/res/drawable-land/remote_xbox_down_up.png b/XBMCRemote/res/drawable-land/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_down_up.png
diff --git a/res/drawable-land/remote_xbox_images.xml b/XBMCRemote/res/drawable-land/remote_xbox_images.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_images.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_images.xml
diff --git a/res/drawable-land/remote_xbox_images_down.png b/XBMCRemote/res/drawable-land/remote_xbox_images_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_images_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_images_down.png
diff --git a/res/drawable-land/remote_xbox_images_up.png b/XBMCRemote/res/drawable-land/remote_xbox_images_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_images_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_images_up.png
diff --git a/res/drawable-land/remote_xbox_info.xml b/XBMCRemote/res/drawable-land/remote_xbox_info.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_info.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_info.xml
diff --git a/res/drawable-land/remote_xbox_info_down.png b/XBMCRemote/res/drawable-land/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_info_down.png
diff --git a/res/drawable-land/remote_xbox_info_up.png b/XBMCRemote/res/drawable-land/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_info_up.png
diff --git a/res/drawable-land/remote_xbox_left.xml b/XBMCRemote/res/drawable-land/remote_xbox_left.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_left.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_left.xml
diff --git a/res/drawable-land/remote_xbox_left_down.png b/XBMCRemote/res/drawable-land/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_left_down.png
diff --git a/res/drawable-land/remote_xbox_left_up.png b/XBMCRemote/res/drawable-land/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_left_up.png
diff --git a/res/drawable-land/remote_xbox_menu.xml b/XBMCRemote/res/drawable-land/remote_xbox_menu.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_menu.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_menu.xml
diff --git a/res/drawable-land/remote_xbox_menu_down.png b/XBMCRemote/res/drawable-land/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_menu_down.png
diff --git a/res/drawable-land/remote_xbox_menu_up.png b/XBMCRemote/res/drawable-land/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_menu_up.png
diff --git a/res/drawable-land/remote_xbox_music.xml b/XBMCRemote/res/drawable-land/remote_xbox_music.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_music.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_music.xml
diff --git a/res/drawable-land/remote_xbox_music_down.png b/XBMCRemote/res/drawable-land/remote_xbox_music_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_music_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_music_down.png
diff --git a/res/drawable-land/remote_xbox_music_up.png b/XBMCRemote/res/drawable-land/remote_xbox_music_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_music_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_music_up.png
diff --git a/res/drawable-land/remote_xbox_next.xml b/XBMCRemote/res/drawable-land/remote_xbox_next.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_next.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_next.xml
diff --git a/res/drawable-land/remote_xbox_next_down.png b/XBMCRemote/res/drawable-land/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_next_down.png
diff --git a/res/drawable-land/remote_xbox_next_up.png b/XBMCRemote/res/drawable-land/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_next_up.png
diff --git a/res/drawable-land/remote_xbox_pause.xml b/XBMCRemote/res/drawable-land/remote_xbox_pause.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_pause.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_pause.xml
diff --git a/res/drawable-land/remote_xbox_pause_down.png b/XBMCRemote/res/drawable-land/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_pause_down.png
diff --git a/res/drawable-land/remote_xbox_pause_up.png b/XBMCRemote/res/drawable-land/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_pause_up.png
diff --git a/res/drawable-land/remote_xbox_play.xml b/XBMCRemote/res/drawable-land/remote_xbox_play.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_play.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_play.xml
diff --git a/res/drawable-land/remote_xbox_play_down.png b/XBMCRemote/res/drawable-land/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_play_down.png
diff --git a/res/drawable-land/remote_xbox_play_up.png b/XBMCRemote/res/drawable-land/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_play_up.png
diff --git a/res/drawable-land/remote_xbox_power.xml b/XBMCRemote/res/drawable-land/remote_xbox_power.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_power.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_power.xml
diff --git a/res/drawable-land/remote_xbox_power_down.png b/XBMCRemote/res/drawable-land/remote_xbox_power_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_power_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_power_down.png
diff --git a/res/drawable-land/remote_xbox_power_up.png b/XBMCRemote/res/drawable-land/remote_xbox_power_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_power_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_power_up.png
diff --git a/res/drawable-land/remote_xbox_previous.xml b/XBMCRemote/res/drawable-land/remote_xbox_previous.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_previous.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_previous.xml
diff --git a/res/drawable-land/remote_xbox_previous_down.png b/XBMCRemote/res/drawable-land/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_previous_down.png
diff --git a/res/drawable-land/remote_xbox_previous_up.png b/XBMCRemote/res/drawable-land/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_previous_up.png
diff --git a/res/drawable-land/remote_xbox_right.xml b/XBMCRemote/res/drawable-land/remote_xbox_right.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_right.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_right.xml
diff --git a/res/drawable-land/remote_xbox_right_down.png b/XBMCRemote/res/drawable-land/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_right_down.png
diff --git a/res/drawable-land/remote_xbox_right_up.png b/XBMCRemote/res/drawable-land/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_right_up.png
diff --git a/res/drawable-land/remote_xbox_seek_back.xml b/XBMCRemote/res/drawable-land/remote_xbox_seek_back.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_back.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_back.xml
diff --git a/res/drawable-land/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable-land/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_back_down.png
diff --git a/res/drawable-land/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable-land/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_back_up.png
diff --git a/res/drawable-land/remote_xbox_seek_forward.xml b/XBMCRemote/res/drawable-land/remote_xbox_seek_forward.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_forward.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_forward.xml
diff --git a/res/drawable-land/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable-land/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_forward_down.png
diff --git a/res/drawable-land/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable-land/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_seek_forward_up.png
diff --git a/res/drawable-land/remote_xbox_select.xml b/XBMCRemote/res/drawable-land/remote_xbox_select.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_select.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_select.xml
diff --git a/res/drawable-land/remote_xbox_select_down.png b/XBMCRemote/res/drawable-land/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_select_down.png
diff --git a/res/drawable-land/remote_xbox_select_up.png b/XBMCRemote/res/drawable-land/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_select_up.png
diff --git a/res/drawable-land/remote_xbox_stop.xml b/XBMCRemote/res/drawable-land/remote_xbox_stop.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_stop.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_stop.xml
diff --git a/res/drawable-land/remote_xbox_stop_down.png b/XBMCRemote/res/drawable-land/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_stop_down.png
diff --git a/res/drawable-land/remote_xbox_stop_up.png b/XBMCRemote/res/drawable-land/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_stop_up.png
diff --git a/res/drawable-land/remote_xbox_title.xml b/XBMCRemote/res/drawable-land/remote_xbox_title.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_title.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_title.xml
diff --git a/res/drawable-land/remote_xbox_title_down.png b/XBMCRemote/res/drawable-land/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_title_down.png
diff --git a/res/drawable-land/remote_xbox_title_up.png b/XBMCRemote/res/drawable-land/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_title_up.png
diff --git a/res/drawable-land/remote_xbox_tv.xml b/XBMCRemote/res/drawable-land/remote_xbox_tv.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_tv.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_tv.xml
diff --git a/res/drawable-land/remote_xbox_tv_down.png b/XBMCRemote/res/drawable-land/remote_xbox_tv_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_tv_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_tv_down.png
diff --git a/res/drawable-land/remote_xbox_tv_up.png b/XBMCRemote/res/drawable-land/remote_xbox_tv_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_tv_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_tv_up.png
diff --git a/res/drawable-land/remote_xbox_up.xml b/XBMCRemote/res/drawable-land/remote_xbox_up.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_up.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_up.xml
diff --git a/res/drawable-land/remote_xbox_up_down.png b/XBMCRemote/res/drawable-land/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_up_down.png
diff --git a/res/drawable-land/remote_xbox_up_up.png b/XBMCRemote/res/drawable-land/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_up_up.png
diff --git a/res/drawable-land/remote_xbox_video.xml b/XBMCRemote/res/drawable-land/remote_xbox_video.xml
similarity index 100%
rename from res/drawable-land/remote_xbox_video.xml
rename to XBMCRemote/res/drawable-land/remote_xbox_video.xml
diff --git a/res/drawable-land/remote_xbox_video_down.png b/XBMCRemote/res/drawable-land/remote_xbox_video_down.png
similarity index 100%
rename from res/drawable-land/remote_xbox_video_down.png
rename to XBMCRemote/res/drawable-land/remote_xbox_video_down.png
diff --git a/res/drawable-land/remote_xbox_video_up.png b/XBMCRemote/res/drawable-land/remote_xbox_video_up.png
similarity index 100%
rename from res/drawable-land/remote_xbox_video_up.png
rename to XBMCRemote/res/drawable-land/remote_xbox_video_up.png
diff --git a/res/drawable-ldpi-v4/remote_gest_cursor.png b/XBMCRemote/res/drawable-ldpi-v4/remote_gest_cursor.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_gest_cursor.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_gest_cursor.png
diff --git a/res/drawable-ldpi-v4/remote_xbox__top_left.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox__top_left.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox__top_left.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox__top_left.png
diff --git a/res/drawable-ldpi-v4/remote_xbox__top_right.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox__top_right.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox__top_right.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox__top_right.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_back_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_back_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_back_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_back_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_display_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_display_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_display_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_display_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_display_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_display_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_display_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_display_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_down_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_down_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_down_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_down_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesture_back_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_back_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesture_back_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_back_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesture_info_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_info_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesture_info_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_info_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesture_menu_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_menu_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesture_menu_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_menu_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesture_title_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_title_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesture_title_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesture_title_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesturezone.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesturezone.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesturezone.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesturezone.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_gesturezone_dim.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesturezone_dim.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_gesturezone_dim.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_gesturezone_dim.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_info_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_info_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_info_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_info_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_left_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_left_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_left_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_left_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_menu_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_menu_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_menu_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_menu_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_next_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_next_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_next_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_next_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_pause_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_pause_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_pause_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_pause_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_play_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_play_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_play_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_play_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_previous_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_previous_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_previous_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_previous_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_right_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_right_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_right_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_right_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_back_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_back_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_forward_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_seek_forward_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_select_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_select_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_select_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_select_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_stop_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_stop_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_stop_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_stop_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_title_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_title_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_title_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_title_up.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_up_down.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_up_down.png
diff --git a/res/drawable-ldpi-v4/remote_xbox_up_up.png b/XBMCRemote/res/drawable-ldpi-v4/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable-ldpi-v4/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable-ldpi-v4/remote_xbox_up_up.png
diff --git a/res/drawable/about_back.png b/XBMCRemote/res/drawable/about_back.png
similarity index 100%
rename from res/drawable/about_back.png
rename to XBMCRemote/res/drawable/about_back.png
diff --git a/res/drawable/bottom_controls_background.png b/XBMCRemote/res/drawable/bottom_controls_background.png
similarity index 100%
rename from res/drawable/bottom_controls_background.png
rename to XBMCRemote/res/drawable/bottom_controls_background.png
diff --git a/res/drawable/bottom_logo.xml b/XBMCRemote/res/drawable/bottom_logo.xml
similarity index 100%
rename from res/drawable/bottom_logo.xml
rename to XBMCRemote/res/drawable/bottom_logo.xml
diff --git a/res/drawable/bottom_logo_down.png b/XBMCRemote/res/drawable/bottom_logo_down.png
similarity index 100%
rename from res/drawable/bottom_logo_down.png
rename to XBMCRemote/res/drawable/bottom_logo_down.png
diff --git a/res/drawable/bottom_logo_up.png b/XBMCRemote/res/drawable/bottom_logo_up.png
similarity index 100%
rename from res/drawable/bottom_logo_up.png
rename to XBMCRemote/res/drawable/bottom_logo_up.png
diff --git a/res/drawable/bottom_text.xml b/XBMCRemote/res/drawable/bottom_text.xml
similarity index 100%
rename from res/drawable/bottom_text.xml
rename to XBMCRemote/res/drawable/bottom_text.xml
diff --git a/res/drawable/bottom_text_down.9.png b/XBMCRemote/res/drawable/bottom_text_down.9.png
similarity index 100%
rename from res/drawable/bottom_text_down.9.png
rename to XBMCRemote/res/drawable/bottom_text_down.9.png
diff --git a/res/drawable/bottom_text_up.9.png b/XBMCRemote/res/drawable/bottom_text_up.9.png
similarity index 100%
rename from res/drawable/bottom_text_up.9.png
rename to XBMCRemote/res/drawable/bottom_text_up.9.png
diff --git a/res/drawable/bottombar_bg.png b/XBMCRemote/res/drawable/bottombar_bg.png
similarity index 100%
rename from res/drawable/bottombar_bg.png
rename to XBMCRemote/res/drawable/bottombar_bg.png
diff --git a/res/drawable/bubble_add.png b/XBMCRemote/res/drawable/bubble_add.png
similarity index 100%
rename from res/drawable/bubble_add.png
rename to XBMCRemote/res/drawable/bubble_add.png
diff --git a/res/drawable/bubble_del.xml b/XBMCRemote/res/drawable/bubble_del.xml
similarity index 100%
rename from res/drawable/bubble_del.xml
rename to XBMCRemote/res/drawable/bubble_del.xml
diff --git a/res/drawable/bubble_del_down.png b/XBMCRemote/res/drawable/bubble_del_down.png
similarity index 100%
rename from res/drawable/bubble_del_down.png
rename to XBMCRemote/res/drawable/bubble_del_down.png
diff --git a/res/drawable/bubble_del_up.png b/XBMCRemote/res/drawable/bubble_del_up.png
similarity index 100%
rename from res/drawable/bubble_del_up.png
rename to XBMCRemote/res/drawable/bubble_del_up.png
diff --git a/res/drawable/check_mark.png b/XBMCRemote/res/drawable/check_mark.png
similarity index 100%
rename from res/drawable/check_mark.png
rename to XBMCRemote/res/drawable/check_mark.png
diff --git a/res/drawable/coverbox_back.png b/XBMCRemote/res/drawable/coverbox_back.png
similarity index 100%
rename from res/drawable/coverbox_back.png
rename to XBMCRemote/res/drawable/coverbox_back.png
diff --git a/res/drawable/default_album.png b/XBMCRemote/res/drawable/default_album.png
similarity index 100%
rename from res/drawable/default_album.png
rename to XBMCRemote/res/drawable/default_album.png
diff --git a/res/drawable/default_jewel.png b/XBMCRemote/res/drawable/default_jewel.png
similarity index 100%
rename from res/drawable/default_jewel.png
rename to XBMCRemote/res/drawable/default_jewel.png
diff --git a/res/drawable/default_poster.png b/XBMCRemote/res/drawable/default_poster.png
similarity index 100%
rename from res/drawable/default_poster.png
rename to XBMCRemote/res/drawable/default_poster.png
diff --git a/res/drawable/default_season.png b/XBMCRemote/res/drawable/default_season.png
similarity index 100%
rename from res/drawable/default_season.png
rename to XBMCRemote/res/drawable/default_season.png
diff --git a/res/drawable/default_tvshow.png b/XBMCRemote/res/drawable/default_tvshow.png
similarity index 100%
rename from res/drawable/default_tvshow.png
rename to XBMCRemote/res/drawable/default_tvshow.png
diff --git a/res/drawable/dialog_full_dark.9.png b/XBMCRemote/res/drawable/dialog_full_dark.9.png
similarity index 100%
rename from res/drawable/dialog_full_dark.9.png
rename to XBMCRemote/res/drawable/dialog_full_dark.9.png
diff --git a/res/drawable/home_bottom.9.png b/XBMCRemote/res/drawable/home_bottom.9.png
similarity index 100%
rename from res/drawable/home_bottom.9.png
rename to XBMCRemote/res/drawable/home_bottom.9.png
diff --git a/res/drawable/icon.png b/XBMCRemote/res/drawable/icon.png
similarity index 100%
rename from res/drawable/icon.png
rename to XBMCRemote/res/drawable/icon.png
diff --git a/res/drawable/icon_album.png b/XBMCRemote/res/drawable/icon_album.png
similarity index 100%
rename from res/drawable/icon_album.png
rename to XBMCRemote/res/drawable/icon_album.png
diff --git a/res/drawable/icon_album_big.png b/XBMCRemote/res/drawable/icon_album_big.png
similarity index 100%
rename from res/drawable/icon_album_big.png
rename to XBMCRemote/res/drawable/icon_album_big.png
diff --git a/res/drawable/icon_album_dark.png b/XBMCRemote/res/drawable/icon_album_dark.png
similarity index 100%
rename from res/drawable/icon_album_dark.png
rename to XBMCRemote/res/drawable/icon_album_dark.png
diff --git a/res/drawable/icon_album_dark_big.png b/XBMCRemote/res/drawable/icon_album_dark_big.png
similarity index 100%
rename from res/drawable/icon_album_dark_big.png
rename to XBMCRemote/res/drawable/icon_album_dark_big.png
diff --git a/res/drawable/icon_artist.png b/XBMCRemote/res/drawable/icon_artist.png
similarity index 100%
rename from res/drawable/icon_artist.png
rename to XBMCRemote/res/drawable/icon_artist.png
diff --git a/res/drawable/icon_artist_dark.png b/XBMCRemote/res/drawable/icon_artist_dark.png
similarity index 100%
rename from res/drawable/icon_artist_dark.png
rename to XBMCRemote/res/drawable/icon_artist_dark.png
diff --git a/res/drawable/icon_file.png b/XBMCRemote/res/drawable/icon_file.png
similarity index 100%
rename from res/drawable/icon_file.png
rename to XBMCRemote/res/drawable/icon_file.png
diff --git a/res/drawable/icon_folder.png b/XBMCRemote/res/drawable/icon_folder.png
similarity index 100%
rename from res/drawable/icon_folder.png
rename to XBMCRemote/res/drawable/icon_folder.png
diff --git a/res/drawable/icon_folder_dark.png b/XBMCRemote/res/drawable/icon_folder_dark.png
similarity index 100%
rename from res/drawable/icon_folder_dark.png
rename to XBMCRemote/res/drawable/icon_folder_dark.png
diff --git a/res/drawable/icon_genre.png b/XBMCRemote/res/drawable/icon_genre.png
similarity index 100%
rename from res/drawable/icon_genre.png
rename to XBMCRemote/res/drawable/icon_genre.png
diff --git a/res/drawable/icon_genre_dark.png b/XBMCRemote/res/drawable/icon_genre_dark.png
similarity index 100%
rename from res/drawable/icon_genre_dark.png
rename to XBMCRemote/res/drawable/icon_genre_dark.png
diff --git a/res/drawable/icon_home_movie.png b/XBMCRemote/res/drawable/icon_home_movie.png
similarity index 100%
rename from res/drawable/icon_home_movie.png
rename to XBMCRemote/res/drawable/icon_home_movie.png
diff --git a/res/drawable/icon_home_music.png b/XBMCRemote/res/drawable/icon_home_music.png
similarity index 100%
rename from res/drawable/icon_home_music.png
rename to XBMCRemote/res/drawable/icon_home_music.png
diff --git a/res/drawable/icon_home_picture.png b/XBMCRemote/res/drawable/icon_home_picture.png
similarity index 100%
rename from res/drawable/icon_home_picture.png
rename to XBMCRemote/res/drawable/icon_home_picture.png
diff --git a/res/drawable/icon_home_playing.png b/XBMCRemote/res/drawable/icon_home_playing.png
similarity index 100%
rename from res/drawable/icon_home_playing.png
rename to XBMCRemote/res/drawable/icon_home_playing.png
diff --git a/res/drawable/icon_home_power.png b/XBMCRemote/res/drawable/icon_home_power.png
similarity index 100%
rename from res/drawable/icon_home_power.png
rename to XBMCRemote/res/drawable/icon_home_power.png
diff --git a/res/drawable/icon_home_reconnect.png b/XBMCRemote/res/drawable/icon_home_reconnect.png
similarity index 100%
rename from res/drawable/icon_home_reconnect.png
rename to XBMCRemote/res/drawable/icon_home_reconnect.png
diff --git a/res/drawable/icon_home_remote.png b/XBMCRemote/res/drawable/icon_home_remote.png
similarity index 100%
rename from res/drawable/icon_home_remote.png
rename to XBMCRemote/res/drawable/icon_home_remote.png
diff --git a/res/drawable/icon_home_tv.png b/XBMCRemote/res/drawable/icon_home_tv.png
similarity index 100%
rename from res/drawable/icon_home_tv.png
rename to XBMCRemote/res/drawable/icon_home_tv.png
diff --git a/res/drawable/icon_home_voice.png b/XBMCRemote/res/drawable/icon_home_voice.png
similarity index 100%
rename from res/drawable/icon_home_voice.png
rename to XBMCRemote/res/drawable/icon_home_voice.png
diff --git a/res/drawable/icon_lastfm.png b/XBMCRemote/res/drawable/icon_lastfm.png
similarity index 100%
rename from res/drawable/icon_lastfm.png
rename to XBMCRemote/res/drawable/icon_lastfm.png
diff --git a/res/drawable/icon_movie_dark.png b/XBMCRemote/res/drawable/icon_movie_dark.png
similarity index 100%
rename from res/drawable/icon_movie_dark.png
rename to XBMCRemote/res/drawable/icon_movie_dark.png
diff --git a/res/drawable/icon_picture.png b/XBMCRemote/res/drawable/icon_picture.png
similarity index 100%
rename from res/drawable/icon_picture.png
rename to XBMCRemote/res/drawable/icon_picture.png
diff --git a/res/drawable/icon_play.png b/XBMCRemote/res/drawable/icon_play.png
similarity index 100%
rename from res/drawable/icon_play.png
rename to XBMCRemote/res/drawable/icon_play.png
diff --git a/res/drawable/icon_playing.png b/XBMCRemote/res/drawable/icon_playing.png
similarity index 100%
rename from res/drawable/icon_playing.png
rename to XBMCRemote/res/drawable/icon_playing.png
diff --git a/res/drawable/icon_playlist_dark.png b/XBMCRemote/res/drawable/icon_playlist_dark.png
similarity index 100%
rename from res/drawable/icon_playlist_dark.png
rename to XBMCRemote/res/drawable/icon_playlist_dark.png
diff --git a/res/drawable/icon_shoutcast.png b/XBMCRemote/res/drawable/icon_shoutcast.png
similarity index 100%
rename from res/drawable/icon_shoutcast.png
rename to XBMCRemote/res/drawable/icon_shoutcast.png
diff --git a/res/drawable/icon_song.png b/XBMCRemote/res/drawable/icon_song.png
similarity index 100%
rename from res/drawable/icon_song.png
rename to XBMCRemote/res/drawable/icon_song.png
diff --git a/res/drawable/icon_song_dark.png b/XBMCRemote/res/drawable/icon_song_dark.png
similarity index 100%
rename from res/drawable/icon_song_dark.png
rename to XBMCRemote/res/drawable/icon_song_dark.png
diff --git a/res/drawable/icon_song_light.png b/XBMCRemote/res/drawable/icon_song_light.png
similarity index 100%
rename from res/drawable/icon_song_light.png
rename to XBMCRemote/res/drawable/icon_song_light.png
diff --git a/res/drawable/icon_va_dark.png b/XBMCRemote/res/drawable/icon_va_dark.png
similarity index 100%
rename from res/drawable/icon_va_dark.png
rename to XBMCRemote/res/drawable/icon_va_dark.png
diff --git a/res/drawable/icon_video.png b/XBMCRemote/res/drawable/icon_video.png
similarity index 100%
rename from res/drawable/icon_video.png
rename to XBMCRemote/res/drawable/icon_video.png
diff --git a/res/drawable/icon_video_light.png b/XBMCRemote/res/drawable/icon_video_light.png
similarity index 100%
rename from res/drawable/icon_video_light.png
rename to XBMCRemote/res/drawable/icon_video_light.png
diff --git a/res/drawable/icon_zip.png b/XBMCRemote/res/drawable/icon_zip.png
similarity index 100%
rename from res/drawable/icon_zip.png
rename to XBMCRemote/res/drawable/icon_zip.png
diff --git a/res/drawable/jewel_cd.9.png b/XBMCRemote/res/drawable/jewel_cd.9.png
similarity index 100%
rename from res/drawable/jewel_cd.9.png
rename to XBMCRemote/res/drawable/jewel_cd.9.png
diff --git a/res/drawable/jewel_dvd.9.png b/XBMCRemote/res/drawable/jewel_dvd.9.png
similarity index 100%
rename from res/drawable/jewel_dvd.9.png
rename to XBMCRemote/res/drawable/jewel_dvd.9.png
diff --git a/res/drawable/jewel_tv.9.png b/XBMCRemote/res/drawable/jewel_tv.9.png
similarity index 100%
rename from res/drawable/jewel_tv.9.png
rename to XBMCRemote/res/drawable/jewel_tv.9.png
diff --git a/res/drawable/layout_top_bar.9.png b/XBMCRemote/res/drawable/layout_top_bar.9.png
similarity index 100%
rename from res/drawable/layout_top_bar.9.png
rename to XBMCRemote/res/drawable/layout_top_bar.9.png
diff --git a/res/drawable/listitem_bg.xml b/XBMCRemote/res/drawable/listitem_bg.xml
similarity index 100%
rename from res/drawable/listitem_bg.xml
rename to XBMCRemote/res/drawable/listitem_bg.xml
diff --git a/res/drawable/listitem_bottom_rounded.9.png b/XBMCRemote/res/drawable/listitem_bottom_rounded.9.png
similarity index 100%
rename from res/drawable/listitem_bottom_rounded.9.png
rename to XBMCRemote/res/drawable/listitem_bottom_rounded.9.png
diff --git a/res/drawable/listitem_subtitle.xml b/XBMCRemote/res/drawable/listitem_subtitle.xml
similarity index 100%
rename from res/drawable/listitem_subtitle.xml
rename to XBMCRemote/res/drawable/listitem_subtitle.xml
diff --git a/res/drawable/listitem_title.xml b/XBMCRemote/res/drawable/listitem_title.xml
similarity index 100%
rename from res/drawable/listitem_title.xml
rename to XBMCRemote/res/drawable/listitem_title.xml
diff --git a/res/drawable/menu_about.png b/XBMCRemote/res/drawable/menu_about.png
similarity index 100%
rename from res/drawable/menu_about.png
rename to XBMCRemote/res/drawable/menu_about.png
diff --git a/res/drawable/menu_add_host.png b/XBMCRemote/res/drawable/menu_add_host.png
similarity index 100%
rename from res/drawable/menu_add_host.png
rename to XBMCRemote/res/drawable/menu_add_host.png
diff --git a/res/drawable/menu_album.png b/XBMCRemote/res/drawable/menu_album.png
similarity index 100%
rename from res/drawable/menu_album.png
rename to XBMCRemote/res/drawable/menu_album.png
diff --git a/res/drawable/menu_download.png b/XBMCRemote/res/drawable/menu_download.png
similarity index 100%
rename from res/drawable/menu_download.png
rename to XBMCRemote/res/drawable/menu_download.png
diff --git a/res/drawable/menu_exit.png b/XBMCRemote/res/drawable/menu_exit.png
similarity index 100%
rename from res/drawable/menu_exit.png
rename to XBMCRemote/res/drawable/menu_exit.png
diff --git a/res/drawable/menu_gesture_mode.png b/XBMCRemote/res/drawable/menu_gesture_mode.png
similarity index 100%
rename from res/drawable/menu_gesture_mode.png
rename to XBMCRemote/res/drawable/menu_gesture_mode.png
diff --git a/res/drawable/menu_hide_watched.png b/XBMCRemote/res/drawable/menu_hide_watched.png
similarity index 100%
rename from res/drawable/menu_hide_watched.png
rename to XBMCRemote/res/drawable/menu_hide_watched.png
diff --git a/res/drawable/menu_nowplaying.png b/XBMCRemote/res/drawable/menu_nowplaying.png
similarity index 100%
rename from res/drawable/menu_nowplaying.png
rename to XBMCRemote/res/drawable/menu_nowplaying.png
diff --git a/res/drawable/menu_refresh.png b/XBMCRemote/res/drawable/menu_refresh.png
similarity index 100%
rename from res/drawable/menu_refresh.png
rename to XBMCRemote/res/drawable/menu_refresh.png
diff --git a/res/drawable/menu_remote.png b/XBMCRemote/res/drawable/menu_remote.png
similarity index 100%
rename from res/drawable/menu_remote.png
rename to XBMCRemote/res/drawable/menu_remote.png
diff --git a/res/drawable/menu_settings.png b/XBMCRemote/res/drawable/menu_settings.png
similarity index 100%
rename from res/drawable/menu_settings.png
rename to XBMCRemote/res/drawable/menu_settings.png
diff --git a/res/drawable/menu_show_watched.png b/XBMCRemote/res/drawable/menu_show_watched.png
similarity index 100%
rename from res/drawable/menu_show_watched.png
rename to XBMCRemote/res/drawable/menu_show_watched.png
diff --git a/res/drawable/menu_song.png b/XBMCRemote/res/drawable/menu_song.png
similarity index 100%
rename from res/drawable/menu_song.png
rename to XBMCRemote/res/drawable/menu_song.png
diff --git a/res/drawable/menu_sort.png b/XBMCRemote/res/drawable/menu_sort.png
similarity index 100%
rename from res/drawable/menu_sort.png
rename to XBMCRemote/res/drawable/menu_sort.png
diff --git a/res/drawable/menu_switch.png b/XBMCRemote/res/drawable/menu_switch.png
similarity index 100%
rename from res/drawable/menu_switch.png
rename to XBMCRemote/res/drawable/menu_switch.png
diff --git a/res/drawable/menu_view.png b/XBMCRemote/res/drawable/menu_view.png
similarity index 100%
rename from res/drawable/menu_view.png
rename to XBMCRemote/res/drawable/menu_view.png
diff --git a/res/drawable/menu_xbmc_exit.png b/XBMCRemote/res/drawable/menu_xbmc_exit.png
similarity index 100%
rename from res/drawable/menu_xbmc_exit.png
rename to XBMCRemote/res/drawable/menu_xbmc_exit.png
diff --git a/res/drawable/menu_xbmc_s.png b/XBMCRemote/res/drawable/menu_xbmc_s.png
similarity index 100%
rename from res/drawable/menu_xbmc_s.png
rename to XBMCRemote/res/drawable/menu_xbmc_s.png
diff --git a/res/drawable/nocover.png b/XBMCRemote/res/drawable/nocover.png
similarity index 100%
rename from res/drawable/nocover.png
rename to XBMCRemote/res/drawable/nocover.png
diff --git a/res/drawable/notif_pause.png b/XBMCRemote/res/drawable/notif_pause.png
similarity index 100%
rename from res/drawable/notif_pause.png
rename to XBMCRemote/res/drawable/notif_pause.png
diff --git a/res/drawable/notif_pic.png b/XBMCRemote/res/drawable/notif_pic.png
similarity index 100%
rename from res/drawable/notif_pic.png
rename to XBMCRemote/res/drawable/notif_pic.png
diff --git a/res/drawable/notif_play.png b/XBMCRemote/res/drawable/notif_play.png
similarity index 100%
rename from res/drawable/notif_play.png
rename to XBMCRemote/res/drawable/notif_play.png
diff --git a/res/drawable/now_playing_next.xml b/XBMCRemote/res/drawable/now_playing_next.xml
similarity index 100%
rename from res/drawable/now_playing_next.xml
rename to XBMCRemote/res/drawable/now_playing_next.xml
diff --git a/res/drawable/now_playing_next_down.png b/XBMCRemote/res/drawable/now_playing_next_down.png
similarity index 100%
rename from res/drawable/now_playing_next_down.png
rename to XBMCRemote/res/drawable/now_playing_next_down.png
diff --git a/res/drawable/now_playing_next_up.png b/XBMCRemote/res/drawable/now_playing_next_up.png
similarity index 100%
rename from res/drawable/now_playing_next_up.png
rename to XBMCRemote/res/drawable/now_playing_next_up.png
diff --git a/res/drawable/now_playing_pause.xml b/XBMCRemote/res/drawable/now_playing_pause.xml
similarity index 100%
rename from res/drawable/now_playing_pause.xml
rename to XBMCRemote/res/drawable/now_playing_pause.xml
diff --git a/res/drawable/now_playing_pause_down.png b/XBMCRemote/res/drawable/now_playing_pause_down.png
similarity index 100%
rename from res/drawable/now_playing_pause_down.png
rename to XBMCRemote/res/drawable/now_playing_pause_down.png
diff --git a/res/drawable/now_playing_pause_up.png b/XBMCRemote/res/drawable/now_playing_pause_up.png
similarity index 100%
rename from res/drawable/now_playing_pause_up.png
rename to XBMCRemote/res/drawable/now_playing_pause_up.png
diff --git a/res/drawable/now_playing_play.xml b/XBMCRemote/res/drawable/now_playing_play.xml
similarity index 100%
rename from res/drawable/now_playing_play.xml
rename to XBMCRemote/res/drawable/now_playing_play.xml
diff --git a/res/drawable/now_playing_play_down.png b/XBMCRemote/res/drawable/now_playing_play_down.png
similarity index 100%
rename from res/drawable/now_playing_play_down.png
rename to XBMCRemote/res/drawable/now_playing_play_down.png
diff --git a/res/drawable/now_playing_play_up.png b/XBMCRemote/res/drawable/now_playing_play_up.png
similarity index 100%
rename from res/drawable/now_playing_play_up.png
rename to XBMCRemote/res/drawable/now_playing_play_up.png
diff --git a/res/drawable/now_playing_playlist.xml b/XBMCRemote/res/drawable/now_playing_playlist.xml
similarity index 100%
rename from res/drawable/now_playing_playlist.xml
rename to XBMCRemote/res/drawable/now_playing_playlist.xml
diff --git a/res/drawable/now_playing_playlist_down.png b/XBMCRemote/res/drawable/now_playing_playlist_down.png
similarity index 100%
rename from res/drawable/now_playing_playlist_down.png
rename to XBMCRemote/res/drawable/now_playing_playlist_down.png
diff --git a/res/drawable/now_playing_playlist_up.png b/XBMCRemote/res/drawable/now_playing_playlist_up.png
similarity index 100%
rename from res/drawable/now_playing_playlist_up.png
rename to XBMCRemote/res/drawable/now_playing_playlist_up.png
diff --git a/res/drawable/now_playing_previous.xml b/XBMCRemote/res/drawable/now_playing_previous.xml
similarity index 100%
rename from res/drawable/now_playing_previous.xml
rename to XBMCRemote/res/drawable/now_playing_previous.xml
diff --git a/res/drawable/now_playing_previous_down.png b/XBMCRemote/res/drawable/now_playing_previous_down.png
similarity index 100%
rename from res/drawable/now_playing_previous_down.png
rename to XBMCRemote/res/drawable/now_playing_previous_down.png
diff --git a/res/drawable/now_playing_previous_up.png b/XBMCRemote/res/drawable/now_playing_previous_up.png
similarity index 100%
rename from res/drawable/now_playing_previous_up.png
rename to XBMCRemote/res/drawable/now_playing_previous_up.png
diff --git a/res/drawable/now_playing_stop.xml b/XBMCRemote/res/drawable/now_playing_stop.xml
similarity index 100%
rename from res/drawable/now_playing_stop.xml
rename to XBMCRemote/res/drawable/now_playing_stop.xml
diff --git a/res/drawable/now_playing_stop_down.png b/XBMCRemote/res/drawable/now_playing_stop_down.png
similarity index 100%
rename from res/drawable/now_playing_stop_down.png
rename to XBMCRemote/res/drawable/now_playing_stop_down.png
diff --git a/res/drawable/now_playing_stop_up.png b/XBMCRemote/res/drawable/now_playing_stop_up.png
similarity index 100%
rename from res/drawable/now_playing_stop_up.png
rename to XBMCRemote/res/drawable/now_playing_stop_up.png
diff --git a/res/drawable/person.png b/XBMCRemote/res/drawable/person.png
similarity index 100%
rename from res/drawable/person.png
rename to XBMCRemote/res/drawable/person.png
diff --git a/res/drawable/person_black_small.png b/XBMCRemote/res/drawable/person_black_small.png
similarity index 100%
rename from res/drawable/person_black_small.png
rename to XBMCRemote/res/drawable/person_black_small.png
diff --git a/res/drawable/person_small.png b/XBMCRemote/res/drawable/person_small.png
similarity index 100%
rename from res/drawable/person_small.png
rename to XBMCRemote/res/drawable/person_small.png
diff --git a/res/drawable/pgbar_act.png b/XBMCRemote/res/drawable/pgbar_act.png
similarity index 100%
rename from res/drawable/pgbar_act.png
rename to XBMCRemote/res/drawable/pgbar_act.png
diff --git a/res/drawable/pgbar_inact.png b/XBMCRemote/res/drawable/pgbar_inact.png
similarity index 100%
rename from res/drawable/pgbar_inact.png
rename to XBMCRemote/res/drawable/pgbar_inact.png
diff --git a/res/drawable/pgbar_thumb.png b/XBMCRemote/res/drawable/pgbar_thumb.png
similarity index 100%
rename from res/drawable/pgbar_thumb.png
rename to XBMCRemote/res/drawable/pgbar_thumb.png
diff --git a/res/drawable/playlist_rightboxes.png b/XBMCRemote/res/drawable/playlist_rightboxes.png
similarity index 100%
rename from res/drawable/playlist_rightboxes.png
rename to XBMCRemote/res/drawable/playlist_rightboxes.png
diff --git a/res/drawable/poster_big.png b/XBMCRemote/res/drawable/poster_big.png
similarity index 100%
rename from res/drawable/poster_big.png
rename to XBMCRemote/res/drawable/poster_big.png
diff --git a/res/drawable/progressbar.xml b/XBMCRemote/res/drawable/progressbar.xml
similarity index 100%
rename from res/drawable/progressbar.xml
rename to XBMCRemote/res/drawable/progressbar.xml
diff --git a/res/drawable/remote_gest_border_left.png b/XBMCRemote/res/drawable/remote_gest_border_left.png
similarity index 100%
rename from res/drawable/remote_gest_border_left.png
rename to XBMCRemote/res/drawable/remote_gest_border_left.png
diff --git a/res/drawable/remote_gest_border_right.png b/XBMCRemote/res/drawable/remote_gest_border_right.png
similarity index 100%
rename from res/drawable/remote_gest_border_right.png
rename to XBMCRemote/res/drawable/remote_gest_border_right.png
diff --git a/res/drawable/remote_gest_cursor.png b/XBMCRemote/res/drawable/remote_gest_cursor.png
similarity index 100%
rename from res/drawable/remote_gest_cursor.png
rename to XBMCRemote/res/drawable/remote_gest_cursor.png
diff --git a/res/drawable/remote_xbox__top_left.png b/XBMCRemote/res/drawable/remote_xbox__top_left.png
similarity index 100%
rename from res/drawable/remote_xbox__top_left.png
rename to XBMCRemote/res/drawable/remote_xbox__top_left.png
diff --git a/res/drawable/remote_xbox__top_right.png b/XBMCRemote/res/drawable/remote_xbox__top_right.png
similarity index 100%
rename from res/drawable/remote_xbox__top_right.png
rename to XBMCRemote/res/drawable/remote_xbox__top_right.png
diff --git a/res/drawable/remote_xbox_back.xml b/XBMCRemote/res/drawable/remote_xbox_back.xml
similarity index 100%
rename from res/drawable/remote_xbox_back.xml
rename to XBMCRemote/res/drawable/remote_xbox_back.xml
diff --git a/res/drawable/remote_xbox_back_down.png b/XBMCRemote/res/drawable/remote_xbox_back_down.png
similarity index 100%
rename from res/drawable/remote_xbox_back_down.png
rename to XBMCRemote/res/drawable/remote_xbox_back_down.png
diff --git a/res/drawable/remote_xbox_back_up.png b/XBMCRemote/res/drawable/remote_xbox_back_up.png
similarity index 100%
rename from res/drawable/remote_xbox_back_up.png
rename to XBMCRemote/res/drawable/remote_xbox_back_up.png
diff --git a/res/drawable/remote_xbox_display.xml b/XBMCRemote/res/drawable/remote_xbox_display.xml
similarity index 100%
rename from res/drawable/remote_xbox_display.xml
rename to XBMCRemote/res/drawable/remote_xbox_display.xml
diff --git a/res/drawable/remote_xbox_display_down.png b/XBMCRemote/res/drawable/remote_xbox_display_down.png
similarity index 100%
rename from res/drawable/remote_xbox_display_down.png
rename to XBMCRemote/res/drawable/remote_xbox_display_down.png
diff --git a/res/drawable/remote_xbox_display_up.png b/XBMCRemote/res/drawable/remote_xbox_display_up.png
similarity index 100%
rename from res/drawable/remote_xbox_display_up.png
rename to XBMCRemote/res/drawable/remote_xbox_display_up.png
diff --git a/res/drawable/remote_xbox_down.xml b/XBMCRemote/res/drawable/remote_xbox_down.xml
similarity index 100%
rename from res/drawable/remote_xbox_down.xml
rename to XBMCRemote/res/drawable/remote_xbox_down.xml
diff --git a/res/drawable/remote_xbox_down_down.png b/XBMCRemote/res/drawable/remote_xbox_down_down.png
similarity index 100%
rename from res/drawable/remote_xbox_down_down.png
rename to XBMCRemote/res/drawable/remote_xbox_down_down.png
diff --git a/res/drawable/remote_xbox_down_up.png b/XBMCRemote/res/drawable/remote_xbox_down_up.png
similarity index 100%
rename from res/drawable/remote_xbox_down_up.png
rename to XBMCRemote/res/drawable/remote_xbox_down_up.png
diff --git a/res/drawable/remote_xbox_gesture_back_down.png b/XBMCRemote/res/drawable/remote_xbox_gesture_back_down.png
similarity index 100%
rename from res/drawable/remote_xbox_gesture_back_down.png
rename to XBMCRemote/res/drawable/remote_xbox_gesture_back_down.png
diff --git a/res/drawable/remote_xbox_gesture_info_down.png b/XBMCRemote/res/drawable/remote_xbox_gesture_info_down.png
similarity index 100%
rename from res/drawable/remote_xbox_gesture_info_down.png
rename to XBMCRemote/res/drawable/remote_xbox_gesture_info_down.png
diff --git a/res/drawable/remote_xbox_gesture_menu_down.png b/XBMCRemote/res/drawable/remote_xbox_gesture_menu_down.png
similarity index 100%
rename from res/drawable/remote_xbox_gesture_menu_down.png
rename to XBMCRemote/res/drawable/remote_xbox_gesture_menu_down.png
diff --git a/res/drawable/remote_xbox_gesture_title_down.png b/XBMCRemote/res/drawable/remote_xbox_gesture_title_down.png
similarity index 100%
rename from res/drawable/remote_xbox_gesture_title_down.png
rename to XBMCRemote/res/drawable/remote_xbox_gesture_title_down.png
diff --git a/res/drawable/remote_xbox_gesturezone.png b/XBMCRemote/res/drawable/remote_xbox_gesturezone.png
similarity index 100%
rename from res/drawable/remote_xbox_gesturezone.png
rename to XBMCRemote/res/drawable/remote_xbox_gesturezone.png
diff --git a/res/drawable/remote_xbox_gesturezone_dim.png b/XBMCRemote/res/drawable/remote_xbox_gesturezone_dim.png
similarity index 100%
rename from res/drawable/remote_xbox_gesturezone_dim.png
rename to XBMCRemote/res/drawable/remote_xbox_gesturezone_dim.png
diff --git a/res/drawable/remote_xbox_info.xml b/XBMCRemote/res/drawable/remote_xbox_info.xml
similarity index 100%
rename from res/drawable/remote_xbox_info.xml
rename to XBMCRemote/res/drawable/remote_xbox_info.xml
diff --git a/res/drawable/remote_xbox_info_down.png b/XBMCRemote/res/drawable/remote_xbox_info_down.png
similarity index 100%
rename from res/drawable/remote_xbox_info_down.png
rename to XBMCRemote/res/drawable/remote_xbox_info_down.png
diff --git a/res/drawable/remote_xbox_info_up.png b/XBMCRemote/res/drawable/remote_xbox_info_up.png
similarity index 100%
rename from res/drawable/remote_xbox_info_up.png
rename to XBMCRemote/res/drawable/remote_xbox_info_up.png
diff --git a/res/drawable/remote_xbox_left.xml b/XBMCRemote/res/drawable/remote_xbox_left.xml
similarity index 100%
rename from res/drawable/remote_xbox_left.xml
rename to XBMCRemote/res/drawable/remote_xbox_left.xml
diff --git a/res/drawable/remote_xbox_left_down.png b/XBMCRemote/res/drawable/remote_xbox_left_down.png
similarity index 100%
rename from res/drawable/remote_xbox_left_down.png
rename to XBMCRemote/res/drawable/remote_xbox_left_down.png
diff --git a/res/drawable/remote_xbox_left_up.png b/XBMCRemote/res/drawable/remote_xbox_left_up.png
similarity index 100%
rename from res/drawable/remote_xbox_left_up.png
rename to XBMCRemote/res/drawable/remote_xbox_left_up.png
diff --git a/res/drawable/remote_xbox_menu.xml b/XBMCRemote/res/drawable/remote_xbox_menu.xml
similarity index 100%
rename from res/drawable/remote_xbox_menu.xml
rename to XBMCRemote/res/drawable/remote_xbox_menu.xml
diff --git a/res/drawable/remote_xbox_menu_down.png b/XBMCRemote/res/drawable/remote_xbox_menu_down.png
similarity index 100%
rename from res/drawable/remote_xbox_menu_down.png
rename to XBMCRemote/res/drawable/remote_xbox_menu_down.png
diff --git a/res/drawable/remote_xbox_menu_up.png b/XBMCRemote/res/drawable/remote_xbox_menu_up.png
similarity index 100%
rename from res/drawable/remote_xbox_menu_up.png
rename to XBMCRemote/res/drawable/remote_xbox_menu_up.png
diff --git a/res/drawable/remote_xbox_next.xml b/XBMCRemote/res/drawable/remote_xbox_next.xml
similarity index 100%
rename from res/drawable/remote_xbox_next.xml
rename to XBMCRemote/res/drawable/remote_xbox_next.xml
diff --git a/res/drawable/remote_xbox_next_down.png b/XBMCRemote/res/drawable/remote_xbox_next_down.png
similarity index 100%
rename from res/drawable/remote_xbox_next_down.png
rename to XBMCRemote/res/drawable/remote_xbox_next_down.png
diff --git a/res/drawable/remote_xbox_next_up.png b/XBMCRemote/res/drawable/remote_xbox_next_up.png
similarity index 100%
rename from res/drawable/remote_xbox_next_up.png
rename to XBMCRemote/res/drawable/remote_xbox_next_up.png
diff --git a/res/drawable/remote_xbox_pause.xml b/XBMCRemote/res/drawable/remote_xbox_pause.xml
similarity index 100%
rename from res/drawable/remote_xbox_pause.xml
rename to XBMCRemote/res/drawable/remote_xbox_pause.xml
diff --git a/res/drawable/remote_xbox_pause_down.png b/XBMCRemote/res/drawable/remote_xbox_pause_down.png
similarity index 100%
rename from res/drawable/remote_xbox_pause_down.png
rename to XBMCRemote/res/drawable/remote_xbox_pause_down.png
diff --git a/res/drawable/remote_xbox_pause_up.png b/XBMCRemote/res/drawable/remote_xbox_pause_up.png
similarity index 100%
rename from res/drawable/remote_xbox_pause_up.png
rename to XBMCRemote/res/drawable/remote_xbox_pause_up.png
diff --git a/res/drawable/remote_xbox_play.xml b/XBMCRemote/res/drawable/remote_xbox_play.xml
similarity index 100%
rename from res/drawable/remote_xbox_play.xml
rename to XBMCRemote/res/drawable/remote_xbox_play.xml
diff --git a/res/drawable/remote_xbox_play_down.png b/XBMCRemote/res/drawable/remote_xbox_play_down.png
similarity index 100%
rename from res/drawable/remote_xbox_play_down.png
rename to XBMCRemote/res/drawable/remote_xbox_play_down.png
diff --git a/res/drawable/remote_xbox_play_up.png b/XBMCRemote/res/drawable/remote_xbox_play_up.png
similarity index 100%
rename from res/drawable/remote_xbox_play_up.png
rename to XBMCRemote/res/drawable/remote_xbox_play_up.png
diff --git a/res/drawable/remote_xbox_previous.xml b/XBMCRemote/res/drawable/remote_xbox_previous.xml
similarity index 100%
rename from res/drawable/remote_xbox_previous.xml
rename to XBMCRemote/res/drawable/remote_xbox_previous.xml
diff --git a/res/drawable/remote_xbox_previous_down.png b/XBMCRemote/res/drawable/remote_xbox_previous_down.png
similarity index 100%
rename from res/drawable/remote_xbox_previous_down.png
rename to XBMCRemote/res/drawable/remote_xbox_previous_down.png
diff --git a/res/drawable/remote_xbox_previous_up.png b/XBMCRemote/res/drawable/remote_xbox_previous_up.png
similarity index 100%
rename from res/drawable/remote_xbox_previous_up.png
rename to XBMCRemote/res/drawable/remote_xbox_previous_up.png
diff --git a/res/drawable/remote_xbox_right.xml b/XBMCRemote/res/drawable/remote_xbox_right.xml
similarity index 100%
rename from res/drawable/remote_xbox_right.xml
rename to XBMCRemote/res/drawable/remote_xbox_right.xml
diff --git a/res/drawable/remote_xbox_right_down.png b/XBMCRemote/res/drawable/remote_xbox_right_down.png
similarity index 100%
rename from res/drawable/remote_xbox_right_down.png
rename to XBMCRemote/res/drawable/remote_xbox_right_down.png
diff --git a/res/drawable/remote_xbox_right_up.png b/XBMCRemote/res/drawable/remote_xbox_right_up.png
similarity index 100%
rename from res/drawable/remote_xbox_right_up.png
rename to XBMCRemote/res/drawable/remote_xbox_right_up.png
diff --git a/res/drawable/remote_xbox_seek_back.xml b/XBMCRemote/res/drawable/remote_xbox_seek_back.xml
similarity index 100%
rename from res/drawable/remote_xbox_seek_back.xml
rename to XBMCRemote/res/drawable/remote_xbox_seek_back.xml
diff --git a/res/drawable/remote_xbox_seek_back_down.png b/XBMCRemote/res/drawable/remote_xbox_seek_back_down.png
similarity index 100%
rename from res/drawable/remote_xbox_seek_back_down.png
rename to XBMCRemote/res/drawable/remote_xbox_seek_back_down.png
diff --git a/res/drawable/remote_xbox_seek_back_up.png b/XBMCRemote/res/drawable/remote_xbox_seek_back_up.png
similarity index 100%
rename from res/drawable/remote_xbox_seek_back_up.png
rename to XBMCRemote/res/drawable/remote_xbox_seek_back_up.png
diff --git a/res/drawable/remote_xbox_seek_forward.xml b/XBMCRemote/res/drawable/remote_xbox_seek_forward.xml
similarity index 100%
rename from res/drawable/remote_xbox_seek_forward.xml
rename to XBMCRemote/res/drawable/remote_xbox_seek_forward.xml
diff --git a/res/drawable/remote_xbox_seek_forward_down.png b/XBMCRemote/res/drawable/remote_xbox_seek_forward_down.png
similarity index 100%
rename from res/drawable/remote_xbox_seek_forward_down.png
rename to XBMCRemote/res/drawable/remote_xbox_seek_forward_down.png
diff --git a/res/drawable/remote_xbox_seek_forward_up.png b/XBMCRemote/res/drawable/remote_xbox_seek_forward_up.png
similarity index 100%
rename from res/drawable/remote_xbox_seek_forward_up.png
rename to XBMCRemote/res/drawable/remote_xbox_seek_forward_up.png
diff --git a/res/drawable/remote_xbox_select.xml b/XBMCRemote/res/drawable/remote_xbox_select.xml
similarity index 100%
rename from res/drawable/remote_xbox_select.xml
rename to XBMCRemote/res/drawable/remote_xbox_select.xml
diff --git a/res/drawable/remote_xbox_select_down.png b/XBMCRemote/res/drawable/remote_xbox_select_down.png
similarity index 100%
rename from res/drawable/remote_xbox_select_down.png
rename to XBMCRemote/res/drawable/remote_xbox_select_down.png
diff --git a/res/drawable/remote_xbox_select_up.png b/XBMCRemote/res/drawable/remote_xbox_select_up.png
similarity index 100%
rename from res/drawable/remote_xbox_select_up.png
rename to XBMCRemote/res/drawable/remote_xbox_select_up.png
diff --git a/res/drawable/remote_xbox_stop.xml b/XBMCRemote/res/drawable/remote_xbox_stop.xml
similarity index 100%
rename from res/drawable/remote_xbox_stop.xml
rename to XBMCRemote/res/drawable/remote_xbox_stop.xml
diff --git a/res/drawable/remote_xbox_stop_down.png b/XBMCRemote/res/drawable/remote_xbox_stop_down.png
similarity index 100%
rename from res/drawable/remote_xbox_stop_down.png
rename to XBMCRemote/res/drawable/remote_xbox_stop_down.png
diff --git a/res/drawable/remote_xbox_stop_up.png b/XBMCRemote/res/drawable/remote_xbox_stop_up.png
similarity index 100%
rename from res/drawable/remote_xbox_stop_up.png
rename to XBMCRemote/res/drawable/remote_xbox_stop_up.png
diff --git a/res/drawable/remote_xbox_title.xml b/XBMCRemote/res/drawable/remote_xbox_title.xml
similarity index 100%
rename from res/drawable/remote_xbox_title.xml
rename to XBMCRemote/res/drawable/remote_xbox_title.xml
diff --git a/res/drawable/remote_xbox_title_down.png b/XBMCRemote/res/drawable/remote_xbox_title_down.png
similarity index 100%
rename from res/drawable/remote_xbox_title_down.png
rename to XBMCRemote/res/drawable/remote_xbox_title_down.png
diff --git a/res/drawable/remote_xbox_title_up.png b/XBMCRemote/res/drawable/remote_xbox_title_up.png
similarity index 100%
rename from res/drawable/remote_xbox_title_up.png
rename to XBMCRemote/res/drawable/remote_xbox_title_up.png
diff --git a/res/drawable/remote_xbox_up.xml b/XBMCRemote/res/drawable/remote_xbox_up.xml
similarity index 100%
rename from res/drawable/remote_xbox_up.xml
rename to XBMCRemote/res/drawable/remote_xbox_up.xml
diff --git a/res/drawable/remote_xbox_up_down.png b/XBMCRemote/res/drawable/remote_xbox_up_down.png
similarity index 100%
rename from res/drawable/remote_xbox_up_down.png
rename to XBMCRemote/res/drawable/remote_xbox_up_down.png
diff --git a/res/drawable/remote_xbox_up_up.png b/XBMCRemote/res/drawable/remote_xbox_up_up.png
similarity index 100%
rename from res/drawable/remote_xbox_up_up.png
rename to XBMCRemote/res/drawable/remote_xbox_up_up.png
diff --git a/res/drawable/scrollbar_handle.png b/XBMCRemote/res/drawable/scrollbar_handle.png
similarity index 100%
rename from res/drawable/scrollbar_handle.png
rename to XBMCRemote/res/drawable/scrollbar_handle.png
diff --git a/res/drawable/scrollbar_handle_accelerated_anim2.9.png b/XBMCRemote/res/drawable/scrollbar_handle_accelerated_anim2.9.png
similarity index 100%
rename from res/drawable/scrollbar_handle_accelerated_anim2.9.png
rename to XBMCRemote/res/drawable/scrollbar_handle_accelerated_anim2.9.png
diff --git a/res/drawable/selected.9.png b/XBMCRemote/res/drawable/selected.9.png
similarity index 100%
rename from res/drawable/selected.9.png
rename to XBMCRemote/res/drawable/selected.9.png
diff --git a/res/drawable/shiny_black_back.png b/XBMCRemote/res/drawable/shiny_black_back.png
similarity index 100%
rename from res/drawable/shiny_black_back.png
rename to XBMCRemote/res/drawable/shiny_black_back.png
diff --git a/res/drawable/smallborder.9.png b/XBMCRemote/res/drawable/smallborder.9.png
similarity index 100%
rename from res/drawable/smallborder.9.png
rename to XBMCRemote/res/drawable/smallborder.9.png
diff --git a/res/drawable/st_actor_off.png b/XBMCRemote/res/drawable/st_actor_off.png
similarity index 100%
rename from res/drawable/st_actor_off.png
rename to XBMCRemote/res/drawable/st_actor_off.png
diff --git a/res/drawable/st_actor_on.png b/XBMCRemote/res/drawable/st_actor_on.png
similarity index 100%
rename from res/drawable/st_actor_on.png
rename to XBMCRemote/res/drawable/st_actor_on.png
diff --git a/res/drawable/st_actor_over.png b/XBMCRemote/res/drawable/st_actor_over.png
similarity index 100%
rename from res/drawable/st_actor_over.png
rename to XBMCRemote/res/drawable/st_actor_over.png
diff --git a/res/drawable/st_album_off.png b/XBMCRemote/res/drawable/st_album_off.png
similarity index 100%
rename from res/drawable/st_album_off.png
rename to XBMCRemote/res/drawable/st_album_off.png
diff --git a/res/drawable/st_album_on.png b/XBMCRemote/res/drawable/st_album_on.png
similarity index 100%
rename from res/drawable/st_album_on.png
rename to XBMCRemote/res/drawable/st_album_on.png
diff --git a/res/drawable/st_album_over.png b/XBMCRemote/res/drawable/st_album_over.png
similarity index 100%
rename from res/drawable/st_album_over.png
rename to XBMCRemote/res/drawable/st_album_over.png
diff --git a/res/drawable/st_artist_off.png b/XBMCRemote/res/drawable/st_artist_off.png
similarity index 100%
rename from res/drawable/st_artist_off.png
rename to XBMCRemote/res/drawable/st_artist_off.png
diff --git a/res/drawable/st_artist_on.png b/XBMCRemote/res/drawable/st_artist_on.png
similarity index 100%
rename from res/drawable/st_artist_on.png
rename to XBMCRemote/res/drawable/st_artist_on.png
diff --git a/res/drawable/st_artist_over.png b/XBMCRemote/res/drawable/st_artist_over.png
similarity index 100%
rename from res/drawable/st_artist_over.png
rename to XBMCRemote/res/drawable/st_artist_over.png
diff --git a/res/drawable/st_background.png b/XBMCRemote/res/drawable/st_background.png
similarity index 100%
rename from res/drawable/st_background.png
rename to XBMCRemote/res/drawable/st_background.png
diff --git a/res/drawable/st_filemode_off.png b/XBMCRemote/res/drawable/st_filemode_off.png
similarity index 100%
rename from res/drawable/st_filemode_off.png
rename to XBMCRemote/res/drawable/st_filemode_off.png
diff --git a/res/drawable/st_filemode_on.png b/XBMCRemote/res/drawable/st_filemode_on.png
similarity index 100%
rename from res/drawable/st_filemode_on.png
rename to XBMCRemote/res/drawable/st_filemode_on.png
diff --git a/res/drawable/st_filemode_over.png b/XBMCRemote/res/drawable/st_filemode_over.png
similarity index 100%
rename from res/drawable/st_filemode_over.png
rename to XBMCRemote/res/drawable/st_filemode_over.png
diff --git a/res/drawable/st_genre_off.png b/XBMCRemote/res/drawable/st_genre_off.png
similarity index 100%
rename from res/drawable/st_genre_off.png
rename to XBMCRemote/res/drawable/st_genre_off.png
diff --git a/res/drawable/st_genre_on.png b/XBMCRemote/res/drawable/st_genre_on.png
similarity index 100%
rename from res/drawable/st_genre_on.png
rename to XBMCRemote/res/drawable/st_genre_on.png
diff --git a/res/drawable/st_genre_over.png b/XBMCRemote/res/drawable/st_genre_over.png
similarity index 100%
rename from res/drawable/st_genre_over.png
rename to XBMCRemote/res/drawable/st_genre_over.png
diff --git a/res/drawable/st_movie_off.png b/XBMCRemote/res/drawable/st_movie_off.png
similarity index 100%
rename from res/drawable/st_movie_off.png
rename to XBMCRemote/res/drawable/st_movie_off.png
diff --git a/res/drawable/st_movie_on.png b/XBMCRemote/res/drawable/st_movie_on.png
similarity index 100%
rename from res/drawable/st_movie_on.png
rename to XBMCRemote/res/drawable/st_movie_on.png
diff --git a/res/drawable/st_movie_over.png b/XBMCRemote/res/drawable/st_movie_over.png
similarity index 100%
rename from res/drawable/st_movie_over.png
rename to XBMCRemote/res/drawable/st_movie_over.png
diff --git a/res/drawable/st_playlist_off.png b/XBMCRemote/res/drawable/st_playlist_off.png
similarity index 100%
rename from res/drawable/st_playlist_off.png
rename to XBMCRemote/res/drawable/st_playlist_off.png
diff --git a/res/drawable/st_playlist_on.png b/XBMCRemote/res/drawable/st_playlist_on.png
similarity index 100%
rename from res/drawable/st_playlist_on.png
rename to XBMCRemote/res/drawable/st_playlist_on.png
diff --git a/res/drawable/st_playlist_over.png b/XBMCRemote/res/drawable/st_playlist_over.png
similarity index 100%
rename from res/drawable/st_playlist_over.png
rename to XBMCRemote/res/drawable/st_playlist_over.png
diff --git a/res/drawable/st_slider.png b/XBMCRemote/res/drawable/st_slider.png
similarity index 100%
rename from res/drawable/st_slider.png
rename to XBMCRemote/res/drawable/st_slider.png
diff --git a/res/drawable/st_song_off.png b/XBMCRemote/res/drawable/st_song_off.png
similarity index 100%
rename from res/drawable/st_song_off.png
rename to XBMCRemote/res/drawable/st_song_off.png
diff --git a/res/drawable/st_song_on.png b/XBMCRemote/res/drawable/st_song_on.png
similarity index 100%
rename from res/drawable/st_song_on.png
rename to XBMCRemote/res/drawable/st_song_on.png
diff --git a/res/drawable/st_song_over.png b/XBMCRemote/res/drawable/st_song_over.png
similarity index 100%
rename from res/drawable/st_song_over.png
rename to XBMCRemote/res/drawable/st_song_over.png
diff --git a/res/drawable/st_tv_off.png b/XBMCRemote/res/drawable/st_tv_off.png
similarity index 100%
rename from res/drawable/st_tv_off.png
rename to XBMCRemote/res/drawable/st_tv_off.png
diff --git a/res/drawable/st_tv_on.png b/XBMCRemote/res/drawable/st_tv_on.png
similarity index 100%
rename from res/drawable/st_tv_on.png
rename to XBMCRemote/res/drawable/st_tv_on.png
diff --git a/res/drawable/st_tv_over.png b/XBMCRemote/res/drawable/st_tv_over.png
similarity index 100%
rename from res/drawable/st_tv_over.png
rename to XBMCRemote/res/drawable/st_tv_over.png
diff --git a/res/drawable/st_va_off.png b/XBMCRemote/res/drawable/st_va_off.png
similarity index 100%
rename from res/drawable/st_va_off.png
rename to XBMCRemote/res/drawable/st_va_off.png
diff --git a/res/drawable/st_va_on.png b/XBMCRemote/res/drawable/st_va_on.png
similarity index 100%
rename from res/drawable/st_va_on.png
rename to XBMCRemote/res/drawable/st_va_on.png
diff --git a/res/drawable/st_va_over.png b/XBMCRemote/res/drawable/st_va_over.png
similarity index 100%
rename from res/drawable/st_va_over.png
rename to XBMCRemote/res/drawable/st_va_over.png
diff --git a/res/drawable/stars_0.png b/XBMCRemote/res/drawable/stars_0.png
similarity index 100%
rename from res/drawable/stars_0.png
rename to XBMCRemote/res/drawable/stars_0.png
diff --git a/res/drawable/stars_1.png b/XBMCRemote/res/drawable/stars_1.png
similarity index 100%
rename from res/drawable/stars_1.png
rename to XBMCRemote/res/drawable/stars_1.png
diff --git a/res/drawable/stars_10.png b/XBMCRemote/res/drawable/stars_10.png
similarity index 100%
rename from res/drawable/stars_10.png
rename to XBMCRemote/res/drawable/stars_10.png
diff --git a/res/drawable/stars_2.png b/XBMCRemote/res/drawable/stars_2.png
similarity index 100%
rename from res/drawable/stars_2.png
rename to XBMCRemote/res/drawable/stars_2.png
diff --git a/res/drawable/stars_3.png b/XBMCRemote/res/drawable/stars_3.png
similarity index 100%
rename from res/drawable/stars_3.png
rename to XBMCRemote/res/drawable/stars_3.png
diff --git a/res/drawable/stars_4.png b/XBMCRemote/res/drawable/stars_4.png
similarity index 100%
rename from res/drawable/stars_4.png
rename to XBMCRemote/res/drawable/stars_4.png
diff --git a/res/drawable/stars_5.png b/XBMCRemote/res/drawable/stars_5.png
similarity index 100%
rename from res/drawable/stars_5.png
rename to XBMCRemote/res/drawable/stars_5.png
diff --git a/res/drawable/stars_6.png b/XBMCRemote/res/drawable/stars_6.png
similarity index 100%
rename from res/drawable/stars_6.png
rename to XBMCRemote/res/drawable/stars_6.png
diff --git a/res/drawable/stars_7.png b/XBMCRemote/res/drawable/stars_7.png
similarity index 100%
rename from res/drawable/stars_7.png
rename to XBMCRemote/res/drawable/stars_7.png
diff --git a/res/drawable/stars_8.png b/XBMCRemote/res/drawable/stars_8.png
similarity index 100%
rename from res/drawable/stars_8.png
rename to XBMCRemote/res/drawable/stars_8.png
diff --git a/res/drawable/stars_9.png b/XBMCRemote/res/drawable/stars_9.png
similarity index 100%
rename from res/drawable/stars_9.png
rename to XBMCRemote/res/drawable/stars_9.png
diff --git a/res/drawable/timeborder.9.png b/XBMCRemote/res/drawable/timeborder.9.png
similarity index 100%
rename from res/drawable/timeborder.9.png
rename to XBMCRemote/res/drawable/timeborder.9.png
diff --git a/res/drawable/waiting.png b/XBMCRemote/res/drawable/waiting.png
similarity index 100%
rename from res/drawable/waiting.png
rename to XBMCRemote/res/drawable/waiting.png
diff --git a/res/layout-land-hdpi-v4/remote_xbox.xml b/XBMCRemote/res/layout-land-hdpi-v4/remote_xbox.xml
similarity index 100%
rename from res/layout-land-hdpi-v4/remote_xbox.xml
rename to XBMCRemote/res/layout-land-hdpi-v4/remote_xbox.xml
diff --git a/res/layout-land-hdpi-v4/remote_xbox_extended.xml b/XBMCRemote/res/layout-land-hdpi-v4/remote_xbox_extended.xml
similarity index 100%
rename from res/layout-land-hdpi-v4/remote_xbox_extended.xml
rename to XBMCRemote/res/layout-land-hdpi-v4/remote_xbox_extended.xml
diff --git a/res/layout-land-ldpi-v4/remote_xbox.xml b/XBMCRemote/res/layout-land-ldpi-v4/remote_xbox.xml
similarity index 100%
rename from res/layout-land-ldpi-v4/remote_xbox.xml
rename to XBMCRemote/res/layout-land-ldpi-v4/remote_xbox.xml
diff --git a/res/layout-land/home.xml b/XBMCRemote/res/layout-land/home.xml
similarity index 100%
rename from res/layout-land/home.xml
rename to XBMCRemote/res/layout-land/home.xml
diff --git a/res/layout-land/nowplaying.xml b/XBMCRemote/res/layout-land/nowplaying.xml
similarity index 100%
rename from res/layout-land/nowplaying.xml
rename to XBMCRemote/res/layout-land/nowplaying.xml
diff --git a/res/layout-land/remote_xbox.xml b/XBMCRemote/res/layout-land/remote_xbox.xml
similarity index 100%
rename from res/layout-land/remote_xbox.xml
rename to XBMCRemote/res/layout-land/remote_xbox.xml
diff --git a/res/layout-ldpi-v4/remote_xbox.xml b/XBMCRemote/res/layout-ldpi-v4/remote_xbox.xml
similarity index 100%
rename from res/layout-ldpi-v4/remote_xbox.xml
rename to XBMCRemote/res/layout-ldpi-v4/remote_xbox.xml
diff --git a/res/layout/about.xml b/XBMCRemote/res/layout/about.xml
similarity index 100%
rename from res/layout/about.xml
rename to XBMCRemote/res/layout/about.xml
diff --git a/res/layout/actor_item.xml b/XBMCRemote/res/layout/actor_item.xml
similarity index 100%
rename from res/layout/actor_item.xml
rename to XBMCRemote/res/layout/actor_item.xml
diff --git a/res/layout/albumgrid.xml b/XBMCRemote/res/layout/albumgrid.xml
similarity index 100%
rename from res/layout/albumgrid.xml
rename to XBMCRemote/res/layout/albumgrid.xml
diff --git a/res/layout/albuminfo.xml b/XBMCRemote/res/layout/albuminfo.xml
similarity index 100%
rename from res/layout/albuminfo.xml
rename to XBMCRemote/res/layout/albuminfo.xml
diff --git a/res/layout/albumtracks.xml b/XBMCRemote/res/layout/albumtracks.xml
similarity index 100%
rename from res/layout/albumtracks.xml
rename to XBMCRemote/res/layout/albumtracks.xml
diff --git a/res/layout/artistinfo.xml b/XBMCRemote/res/layout/artistinfo.xml
similarity index 100%
rename from res/layout/artistinfo.xml
rename to XBMCRemote/res/layout/artistinfo.xml
diff --git a/res/layout/blankgrid.xml b/XBMCRemote/res/layout/blankgrid.xml
similarity index 100%
rename from res/layout/blankgrid.xml
rename to XBMCRemote/res/layout/blankgrid.xml
diff --git a/res/layout/blanklist.xml b/XBMCRemote/res/layout/blanklist.xml
similarity index 100%
rename from res/layout/blanklist.xml
rename to XBMCRemote/res/layout/blanklist.xml
diff --git a/res/layout/home.xml b/XBMCRemote/res/layout/home.xml
similarity index 100%
rename from res/layout/home.xml
rename to XBMCRemote/res/layout/home.xml
diff --git a/res/layout/home_item.xml b/XBMCRemote/res/layout/home_item.xml
similarity index 100%
rename from res/layout/home_item.xml
rename to XBMCRemote/res/layout/home_item.xml
diff --git a/res/layout/listmessage.xml b/XBMCRemote/res/layout/listmessage.xml
similarity index 100%
rename from res/layout/listmessage.xml
rename to XBMCRemote/res/layout/listmessage.xml
diff --git a/res/layout/loading_message.xml b/XBMCRemote/res/layout/loading_message.xml
similarity index 100%
rename from res/layout/loading_message.xml
rename to XBMCRemote/res/layout/loading_message.xml
diff --git a/res/layout/loadinglistentry.xml b/XBMCRemote/res/layout/loadinglistentry.xml
similarity index 100%
rename from res/layout/loadinglistentry.xml
rename to XBMCRemote/res/layout/loadinglistentry.xml
diff --git a/res/layout/moviedetails.xml b/XBMCRemote/res/layout/moviedetails.xml
similarity index 100%
rename from res/layout/moviedetails.xml
rename to XBMCRemote/res/layout/moviedetails.xml
diff --git a/res/layout/movielibrary.xml b/XBMCRemote/res/layout/movielibrary.xml
similarity index 100%
rename from res/layout/movielibrary.xml
rename to XBMCRemote/res/layout/movielibrary.xml
diff --git a/res/layout/musicartist.xml b/XBMCRemote/res/layout/musicartist.xml
similarity index 100%
rename from res/layout/musicartist.xml
rename to XBMCRemote/res/layout/musicartist.xml
diff --git a/res/layout/musicgenre.xml b/XBMCRemote/res/layout/musicgenre.xml
similarity index 100%
rename from res/layout/musicgenre.xml
rename to XBMCRemote/res/layout/musicgenre.xml
diff --git a/res/layout/musiclibrary.xml b/XBMCRemote/res/layout/musiclibrary.xml
similarity index 100%
rename from res/layout/musiclibrary.xml
rename to XBMCRemote/res/layout/musiclibrary.xml
diff --git a/res/layout/nowplaying.xml b/XBMCRemote/res/layout/nowplaying.xml
similarity index 100%
rename from res/layout/nowplaying.xml
rename to XBMCRemote/res/layout/nowplaying.xml
diff --git a/res/layout/playlist.xml b/XBMCRemote/res/layout/playlist.xml
similarity index 100%
rename from res/layout/playlist.xml
rename to XBMCRemote/res/layout/playlist.xml
diff --git a/res/layout/preference_host.xml b/XBMCRemote/res/layout/preference_host.xml
similarity index 100%
rename from res/layout/preference_host.xml
rename to XBMCRemote/res/layout/preference_host.xml
diff --git a/res/layout/remote_gesture.xml b/XBMCRemote/res/layout/remote_gesture.xml
similarity index 100%
rename from res/layout/remote_gesture.xml
rename to XBMCRemote/res/layout/remote_gesture.xml
diff --git a/res/layout/remote_gesture_extended.xml b/XBMCRemote/res/layout/remote_gesture_extended.xml
similarity index 100%
rename from res/layout/remote_gesture_extended.xml
rename to XBMCRemote/res/layout/remote_gesture_extended.xml
diff --git a/res/layout/remote_xbox.xml b/XBMCRemote/res/layout/remote_xbox.xml
similarity index 100%
rename from res/layout/remote_xbox.xml
rename to XBMCRemote/res/layout/remote_xbox.xml
diff --git a/res/layout/remote_xbox_extended.xml b/XBMCRemote/res/layout/remote_xbox_extended.xml
similarity index 100%
rename from res/layout/remote_xbox_extended.xml
rename to XBMCRemote/res/layout/remote_xbox_extended.xml
diff --git a/res/layout/setup_page_1.xml b/XBMCRemote/res/layout/setup_page_1.xml
similarity index 100%
rename from res/layout/setup_page_1.xml
rename to XBMCRemote/res/layout/setup_page_1.xml
diff --git a/res/layout/setup_page_2.xml b/XBMCRemote/res/layout/setup_page_2.xml
similarity index 100%
rename from res/layout/setup_page_2.xml
rename to XBMCRemote/res/layout/setup_page_2.xml
diff --git a/res/layout/setup_page_3.xml b/XBMCRemote/res/layout/setup_page_3.xml
similarity index 100%
rename from res/layout/setup_page_3.xml
rename to XBMCRemote/res/layout/setup_page_3.xml
diff --git a/res/layout/setup_page_login.xml b/XBMCRemote/res/layout/setup_page_login.xml
similarity index 100%
rename from res/layout/setup_page_login.xml
rename to XBMCRemote/res/layout/setup_page_login.xml
diff --git a/res/layout/setup_wizard.xml b/XBMCRemote/res/layout/setup_wizard.xml
similarity index 100%
rename from res/layout/setup_wizard.xml
rename to XBMCRemote/res/layout/setup_wizard.xml
diff --git a/res/layout/slidingtab_overlay.xml b/XBMCRemote/res/layout/slidingtab_overlay.xml
similarity index 100%
rename from res/layout/slidingtab_overlay.xml
rename to XBMCRemote/res/layout/slidingtab_overlay.xml
diff --git a/res/layout/slidingtab_widget.xml b/XBMCRemote/res/layout/slidingtab_widget.xml
similarity index 100%
rename from res/layout/slidingtab_widget.xml
rename to XBMCRemote/res/layout/slidingtab_widget.xml
diff --git a/res/layout/titlebar.xml b/XBMCRemote/res/layout/titlebar.xml
similarity index 100%
rename from res/layout/titlebar.xml
rename to XBMCRemote/res/layout/titlebar.xml
diff --git a/res/layout/tvdetails.xml b/XBMCRemote/res/layout/tvdetails.xml
similarity index 100%
rename from res/layout/tvdetails.xml
rename to XBMCRemote/res/layout/tvdetails.xml
diff --git a/res/layout/tvepisodedetails.xml b/XBMCRemote/res/layout/tvepisodedetails.xml
similarity index 100%
rename from res/layout/tvepisodedetails.xml
rename to XBMCRemote/res/layout/tvepisodedetails.xml
diff --git a/res/layout/tvlibrary.xml b/XBMCRemote/res/layout/tvlibrary.xml
similarity index 100%
rename from res/layout/tvlibrary.xml
rename to XBMCRemote/res/layout/tvlibrary.xml
diff --git a/res/drawable-hdpi-v4/menu_text_entry.png b/XBMCRemote/res/res/drawable-hdpi-v4/menu_text_entry.png
similarity index 100%
rename from res/drawable-hdpi-v4/menu_text_entry.png
rename to XBMCRemote/res/res/drawable-hdpi-v4/menu_text_entry.png
diff --git a/res/drawable/menu_text_entry.png b/XBMCRemote/res/res/drawable/menu_text_entry.png
similarity index 100%
rename from res/drawable/menu_text_entry.png
rename to XBMCRemote/res/res/drawable/menu_text_entry.png
diff --git a/res/layout/sendtext.xml b/XBMCRemote/res/res/layout/sendtext.xml
similarity index 100%
rename from res/layout/sendtext.xml
rename to XBMCRemote/res/res/layout/sendtext.xml
diff --git a/res/values/arrays.xml b/XBMCRemote/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to XBMCRemote/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/XBMCRemote/res/values/attrs.xml
similarity index 100%
rename from res/values/attrs.xml
rename to XBMCRemote/res/values/attrs.xml
diff --git a/res/values/attrs_manifest.xml b/XBMCRemote/res/values/attrs_manifest.xml
similarity index 100%
rename from res/values/attrs_manifest.xml
rename to XBMCRemote/res/values/attrs_manifest.xml
diff --git a/res/values/colors.xml b/XBMCRemote/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to XBMCRemote/res/values/colors.xml
diff --git a/res/values/ids.xml b/XBMCRemote/res/values/ids.xml
similarity index 100%
rename from res/values/ids.xml
rename to XBMCRemote/res/values/ids.xml
diff --git a/res/values/public.xml b/XBMCRemote/res/values/public.xml
similarity index 100%
rename from res/values/public.xml
rename to XBMCRemote/res/values/public.xml
diff --git a/res/values/strings.xml b/XBMCRemote/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to XBMCRemote/res/values/strings.xml
diff --git a/res/values/styles.xml b/XBMCRemote/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to XBMCRemote/res/values/styles.xml
diff --git a/res/values/themes.xml b/XBMCRemote/res/values/themes.xml
similarity index 100%
rename from res/values/themes.xml
rename to XBMCRemote/res/values/themes.xml
diff --git a/res/xml/preferences.xml b/XBMCRemote/res/xml/preferences.xml
similarity index 100%
rename from res/xml/preferences.xml
rename to XBMCRemote/res/xml/preferences.xml
diff --git a/src/org/xbmc/android/remote/business/AbstractManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/AbstractManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/AbstractManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/AbstractManager.java
diff --git a/src/org/xbmc/android/remote/business/AbstractThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/AbstractThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/AbstractThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/AbstractThread.java
diff --git a/src/org/xbmc/android/remote/business/Command.java b/XBMCRemote/src/org/xbmc/android/remote/business/Command.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/Command.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/Command.java
diff --git a/src/org/xbmc/android/remote/business/ControlManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/ControlManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/ControlManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/ControlManager.java
diff --git a/src/org/xbmc/android/remote/business/DiskCacheThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/DiskCacheThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/DiskCacheThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/DiskCacheThread.java
diff --git a/src/org/xbmc/android/remote/business/DownloadThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/DownloadThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/DownloadThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/DownloadThread.java
diff --git a/src/org/xbmc/android/remote/business/EventClientManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/EventClientManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/EventClientManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/EventClientManager.java
diff --git a/src/org/xbmc/android/remote/business/InfoManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/InfoManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/InfoManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/InfoManager.java
diff --git a/src/org/xbmc/android/remote/business/ManagerFactory.java b/XBMCRemote/src/org/xbmc/android/remote/business/ManagerFactory.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/ManagerFactory.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/ManagerFactory.java
diff --git a/src/org/xbmc/android/remote/business/ManagerThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/ManagerThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/ManagerThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/ManagerThread.java
diff --git a/src/org/xbmc/android/remote/business/MemCacheThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/MemCacheThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/MemCacheThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/MemCacheThread.java
diff --git a/src/org/xbmc/android/remote/business/MusicManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/MusicManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/MusicManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/MusicManager.java
diff --git a/src/org/xbmc/android/remote/business/NowPlayingPollerThread.java b/XBMCRemote/src/org/xbmc/android/remote/business/NowPlayingPollerThread.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/NowPlayingPollerThread.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/NowPlayingPollerThread.java
diff --git a/src/org/xbmc/android/remote/business/TvShowManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/TvShowManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/TvShowManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/TvShowManager.java
diff --git a/src/org/xbmc/android/remote/business/VideoManager.java b/XBMCRemote/src/org/xbmc/android/remote/business/VideoManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/VideoManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/VideoManager.java
diff --git a/src/org/xbmc/android/remote/business/provider/HostProvider.java b/XBMCRemote/src/org/xbmc/android/remote/business/provider/HostProvider.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/provider/HostProvider.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/provider/HostProvider.java
diff --git a/src/org/xbmc/android/remote/business/receiver/AndroidBroadcastReceiver.java b/XBMCRemote/src/org/xbmc/android/remote/business/receiver/AndroidBroadcastReceiver.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/receiver/AndroidBroadcastReceiver.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/receiver/AndroidBroadcastReceiver.java
diff --git a/src/org/xbmc/android/remote/business/receiver/AutoStartReceiver.java b/XBMCRemote/src/org/xbmc/android/remote/business/receiver/AutoStartReceiver.java
similarity index 100%
rename from src/org/xbmc/android/remote/business/receiver/AutoStartReceiver.java
rename to XBMCRemote/src/org/xbmc/android/remote/business/receiver/AutoStartReceiver.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/AboutActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/AboutActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/AboutActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/AboutActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/AbsListActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/AbsListActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/AbsListActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/AbsListActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/DialogFactory.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/DialogFactory.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/DialogFactory.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/DialogFactory.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/EpisodeDetailsActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/EpisodeDetailsActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/EpisodeDetailsActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/EpisodeDetailsActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/GestureRemoteActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/GestureRemoteActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/GestureRemoteActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/GestureRemoteActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/GridActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/GridActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/GridActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/GridActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/HomeActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/HomeActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/HomeActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/HomeActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/HostSettingsActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/HostSettingsActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/HostSettingsActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/HostSettingsActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/ListActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/ListActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/ListActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/ListActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MediaIntentActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MediaIntentActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MediaIntentActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MediaIntentActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MovieDetailsActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MovieDetailsActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MovieDetailsActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MovieDetailsActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MovieLibraryActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MovieLibraryActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MovieLibraryActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MovieLibraryActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MusicArtistActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicArtistActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MusicArtistActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicArtistActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MusicGenreActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicGenreActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MusicGenreActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicGenreActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/MusicLibraryActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicLibraryActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/MusicLibraryActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/MusicLibraryActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/NowPlayingActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/NowPlayingActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/NowPlayingActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/NowPlayingActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/NowPlayingNotificationManager.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/NowPlayingNotificationManager.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/NowPlayingNotificationManager.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/NowPlayingNotificationManager.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/PlaylistActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/PlaylistActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/PlaylistActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/PlaylistActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/RemoteActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/RemoteActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/RemoteActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/RemoteActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/SettingsActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/SettingsActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/SettingsActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/SettingsActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/TvShowDetailsActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/TvShowDetailsActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/TvShowDetailsActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/TvShowDetailsActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/TvShowLibraryActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/TvShowLibraryActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/TvShowLibraryActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/TvShowLibraryActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/activity/UrlIntentActivity.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/activity/UrlIntentActivity.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/activity/UrlIntentActivity.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/activity/UrlIntentActivity.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/AbstractController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/AbstractController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/AbstractController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/AbstractController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/ActorListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ActorListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/ActorListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ActorListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/AlbumListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/AlbumListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/AlbumListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/AlbumListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/ArtistListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ArtistListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/ArtistListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ArtistListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/EpisodeListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/EpisodeListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/EpisodeListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/EpisodeListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/FileListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/FileListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/FileListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/FileListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/GestureController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/GestureController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/GestureController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/GestureController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/HomeController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/HomeController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/HomeController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/HomeController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/HostPreference.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/HostPreference.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/HostPreference.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/HostPreference.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/IController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/IController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/IController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/IController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/ListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/ListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/ListControllerOnKeyListener.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ListControllerOnKeyListener.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/ListControllerOnKeyListener.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/ListControllerOnKeyListener.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/MediaIntentController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MediaIntentController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/MediaIntentController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MediaIntentController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/MovieGenreListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MovieGenreListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/MovieGenreListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MovieGenreListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/MovieListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MovieListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/MovieListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MovieListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/MusicGenreListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MusicGenreListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/MusicGenreListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MusicGenreListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/MusicPlaylistController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MusicPlaylistController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/MusicPlaylistController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/MusicPlaylistController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/NowPlayingController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/NowPlayingController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/NowPlayingController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/NowPlayingController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/PlaylistController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/PlaylistController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/PlaylistController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/PlaylistController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/RemoteController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/RemoteController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/RemoteController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/RemoteController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/SeasonListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SeasonListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/SeasonListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SeasonListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/SettingsController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SettingsController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/SettingsController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SettingsController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/SongListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SongListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/SongListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/SongListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/TvShowListController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/TvShowListController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/TvShowListController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/TvShowListController.java
diff --git a/src/org/xbmc/android/remote/presentation/controller/UrlIntentController.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/controller/UrlIntentController.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/controller/UrlIntentController.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/controller/UrlIntentController.java
diff --git a/src/org/xbmc/android/remote/presentation/drawable/CrossFadeDrawable.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/drawable/CrossFadeDrawable.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/drawable/CrossFadeDrawable.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/drawable/CrossFadeDrawable.java
diff --git a/src/org/xbmc/android/remote/presentation/drawable/FastBitmapDrawable.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/drawable/FastBitmapDrawable.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/drawable/FastBitmapDrawable.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/drawable/FastBitmapDrawable.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/AbstractItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/AbstractItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/AbstractItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/AbstractItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/FiveLabelsItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/FiveLabelsItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/FiveLabelsItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/FiveLabelsItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/FlexibleItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/FlexibleItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/FlexibleItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/FlexibleItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/GridPosterItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/GridPosterItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/GridPosterItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/GridPosterItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/JewelView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/JewelView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/JewelView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/JewelView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/OneLabelItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/OneLabelItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/OneLabelItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/OneLabelItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/widget/ThreeLabelsItemView.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/widget/ThreeLabelsItemView.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/widget/ThreeLabelsItemView.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/widget/ThreeLabelsItemView.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/Wizard.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/Wizard.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/Wizard.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/Wizard.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/WizardPage.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/WizardPage.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/WizardPage.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/WizardPage.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/listener/ActionListener.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/listener/ActionListener.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/listener/ActionListener.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/listener/ActionListener.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/listener/PageCanFinishListener.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/listener/PageCanFinishListener.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/listener/PageCanFinishListener.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/listener/PageCanFinishListener.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizard.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizard.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizard.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizard.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage1.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage1.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage1.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage1.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage2.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage2.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage2.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage2.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage3.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage3.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage3.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPage3.java
diff --git a/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPageLogin.java b/XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPageLogin.java
similarity index 100%
rename from src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPageLogin.java
rename to XBMCRemote/src/org/xbmc/android/remote/presentation/wizard/setupwizard/SetupWizardPageLogin.java
diff --git a/src/org/xbmc/android/util/Base64.java b/XBMCRemote/src/org/xbmc/android/util/Base64.java
similarity index 100%
rename from src/org/xbmc/android/util/Base64.java
rename to XBMCRemote/src/org/xbmc/android/util/Base64.java
diff --git a/src/org/xbmc/android/util/ClientFactory.java b/XBMCRemote/src/org/xbmc/android/util/ClientFactory.java
similarity index 100%
rename from src/org/xbmc/android/util/ClientFactory.java
rename to XBMCRemote/src/org/xbmc/android/util/ClientFactory.java
diff --git a/src/org/xbmc/android/util/ConnectionFactory.java b/XBMCRemote/src/org/xbmc/android/util/ConnectionFactory.java
similarity index 100%
rename from src/org/xbmc/android/util/ConnectionFactory.java
rename to XBMCRemote/src/org/xbmc/android/util/ConnectionFactory.java
diff --git a/src/org/xbmc/android/util/Crc32.java b/XBMCRemote/src/org/xbmc/android/util/Crc32.java
similarity index 100%
rename from src/org/xbmc/android/util/Crc32.java
rename to XBMCRemote/src/org/xbmc/android/util/Crc32.java
diff --git a/src/org/xbmc/android/util/HostFactory.java b/XBMCRemote/src/org/xbmc/android/util/HostFactory.java
similarity index 100%
rename from src/org/xbmc/android/util/HostFactory.java
rename to XBMCRemote/src/org/xbmc/android/util/HostFactory.java
diff --git a/src/org/xbmc/android/util/IOUtilities.java b/XBMCRemote/src/org/xbmc/android/util/IOUtilities.java
similarity index 100%
rename from src/org/xbmc/android/util/IOUtilities.java
rename to XBMCRemote/src/org/xbmc/android/util/IOUtilities.java
diff --git a/src/org/xbmc/android/util/ImportUtilities.java b/XBMCRemote/src/org/xbmc/android/util/ImportUtilities.java
similarity index 100%
rename from src/org/xbmc/android/util/ImportUtilities.java
rename to XBMCRemote/src/org/xbmc/android/util/ImportUtilities.java
diff --git a/src/org/xbmc/android/util/KeyTracker.java b/XBMCRemote/src/org/xbmc/android/util/KeyTracker.java
similarity index 100%
rename from src/org/xbmc/android/util/KeyTracker.java
rename to XBMCRemote/src/org/xbmc/android/util/KeyTracker.java
diff --git a/src/org/xbmc/android/util/MacAddressResolver.java b/XBMCRemote/src/org/xbmc/android/util/MacAddressResolver.java
similarity index 100%
rename from src/org/xbmc/android/util/MacAddressResolver.java
rename to XBMCRemote/src/org/xbmc/android/util/MacAddressResolver.java
diff --git a/src/org/xbmc/android/util/OnLongPressBackKeyTracker.java b/XBMCRemote/src/org/xbmc/android/util/OnLongPressBackKeyTracker.java
similarity index 100%
rename from src/org/xbmc/android/util/OnLongPressBackKeyTracker.java
rename to XBMCRemote/src/org/xbmc/android/util/OnLongPressBackKeyTracker.java
diff --git a/src/org/xbmc/android/util/SMSConstants.java b/XBMCRemote/src/org/xbmc/android/util/SMSConstants.java
similarity index 100%
rename from src/org/xbmc/android/util/SMSConstants.java
rename to XBMCRemote/src/org/xbmc/android/util/SMSConstants.java
diff --git a/src/org/xbmc/android/util/SmsMmsMessage.java b/XBMCRemote/src/org/xbmc/android/util/SmsMmsMessage.java
similarity index 100%
rename from src/org/xbmc/android/util/SmsMmsMessage.java
rename to XBMCRemote/src/org/xbmc/android/util/SmsMmsMessage.java
diff --git a/src/org/xbmc/android/util/SmsPopupUtils.java b/XBMCRemote/src/org/xbmc/android/util/SmsPopupUtils.java
similarity index 100%
rename from src/org/xbmc/android/util/SmsPopupUtils.java
rename to XBMCRemote/src/org/xbmc/android/util/SmsPopupUtils.java
diff --git a/src/org/xbmc/android/util/WakeOnLan.java b/XBMCRemote/src/org/xbmc/android/util/WakeOnLan.java
similarity index 100%
rename from src/org/xbmc/android/util/WakeOnLan.java
rename to XBMCRemote/src/org/xbmc/android/util/WakeOnLan.java
diff --git a/src/org/xbmc/android/util/WifiHelper.java b/XBMCRemote/src/org/xbmc/android/util/WifiHelper.java
similarity index 100%
rename from src/org/xbmc/android/util/WifiHelper.java
rename to XBMCRemote/src/org/xbmc/android/util/WifiHelper.java
diff --git a/src/org/xbmc/android/widget/FastScrollView.java b/XBMCRemote/src/org/xbmc/android/widget/FastScrollView.java
similarity index 100%
rename from src/org/xbmc/android/widget/FastScrollView.java
rename to XBMCRemote/src/org/xbmc/android/widget/FastScrollView.java
diff --git a/src/org/xbmc/android/widget/IdleListDetector.java b/XBMCRemote/src/org/xbmc/android/widget/IdleListDetector.java
similarity index 100%
rename from src/org/xbmc/android/widget/IdleListDetector.java
rename to XBMCRemote/src/org/xbmc/android/widget/IdleListDetector.java
diff --git a/src/org/xbmc/android/widget/IdleListener.java b/XBMCRemote/src/org/xbmc/android/widget/IdleListener.java
similarity index 100%
rename from src/org/xbmc/android/widget/IdleListener.java
rename to XBMCRemote/src/org/xbmc/android/widget/IdleListener.java
diff --git a/src/org/xbmc/android/widget/gestureremote/GestureRemoteAnimation.java b/XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteAnimation.java
similarity index 100%
rename from src/org/xbmc/android/widget/gestureremote/GestureRemoteAnimation.java
rename to XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteAnimation.java
diff --git a/src/org/xbmc/android/widget/gestureremote/GestureRemoteCursor.java b/XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteCursor.java
similarity index 100%
rename from src/org/xbmc/android/widget/gestureremote/GestureRemoteCursor.java
rename to XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteCursor.java
diff --git a/src/org/xbmc/android/widget/gestureremote/GestureRemoteView.java b/XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteView.java
similarity index 100%
rename from src/org/xbmc/android/widget/gestureremote/GestureRemoteView.java
rename to XBMCRemote/src/org/xbmc/android/widget/gestureremote/GestureRemoteView.java
diff --git a/src/org/xbmc/android/widget/gestureremote/IGestureListener.java b/XBMCRemote/src/org/xbmc/android/widget/gestureremote/IGestureListener.java
similarity index 100%
rename from src/org/xbmc/android/widget/gestureremote/IGestureListener.java
rename to XBMCRemote/src/org/xbmc/android/widget/gestureremote/IGestureListener.java
diff --git a/src/org/xbmc/android/widget/slidingtabs/SlidingTabActivity.java b/XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabActivity.java
similarity index 100%
rename from src/org/xbmc/android/widget/slidingtabs/SlidingTabActivity.java
rename to XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabActivity.java
diff --git a/src/org/xbmc/android/widget/slidingtabs/SlidingTabHost.java b/XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabHost.java
similarity index 100%
rename from src/org/xbmc/android/widget/slidingtabs/SlidingTabHost.java
rename to XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabHost.java
diff --git a/src/org/xbmc/android/widget/slidingtabs/SlidingTabScrollView.java b/XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabScrollView.java
similarity index 100%
rename from src/org/xbmc/android/widget/slidingtabs/SlidingTabScrollView.java
rename to XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabScrollView.java
diff --git a/src/org/xbmc/android/widget/slidingtabs/SlidingTabWidget.java b/XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabWidget.java
similarity index 100%
rename from src/org/xbmc/android/widget/slidingtabs/SlidingTabWidget.java
rename to XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SlidingTabWidget.java
diff --git a/src/org/xbmc/android/widget/slidingtabs/SnapAnimation.java b/XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SnapAnimation.java
similarity index 100%
rename from src/org/xbmc/android/widget/slidingtabs/SnapAnimation.java
rename to XBMCRemote/src/org/xbmc/android/widget/slidingtabs/SnapAnimation.java
diff --git a/src/org/xbmc/api/business/CoverResponse.java b/XBMCRemote/src/org/xbmc/api/business/CoverResponse.java
similarity index 100%
rename from src/org/xbmc/api/business/CoverResponse.java
rename to XBMCRemote/src/org/xbmc/api/business/CoverResponse.java
diff --git a/src/org/xbmc/api/business/DataResponse.java b/XBMCRemote/src/org/xbmc/api/business/DataResponse.java
similarity index 100%
rename from src/org/xbmc/api/business/DataResponse.java
rename to XBMCRemote/src/org/xbmc/api/business/DataResponse.java
diff --git a/src/org/xbmc/api/business/IControlManager.java b/XBMCRemote/src/org/xbmc/api/business/IControlManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IControlManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IControlManager.java
diff --git a/src/org/xbmc/api/business/IEventClientManager.java b/XBMCRemote/src/org/xbmc/api/business/IEventClientManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IEventClientManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IEventClientManager.java
diff --git a/src/org/xbmc/api/business/IInfoManager.java b/XBMCRemote/src/org/xbmc/api/business/IInfoManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IInfoManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IInfoManager.java
diff --git a/src/org/xbmc/api/business/IManager.java b/XBMCRemote/src/org/xbmc/api/business/IManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IManager.java
diff --git a/src/org/xbmc/api/business/IMusicManager.java b/XBMCRemote/src/org/xbmc/api/business/IMusicManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IMusicManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IMusicManager.java
diff --git a/src/org/xbmc/api/business/INotifiableManager.java b/XBMCRemote/src/org/xbmc/api/business/INotifiableManager.java
similarity index 100%
rename from src/org/xbmc/api/business/INotifiableManager.java
rename to XBMCRemote/src/org/xbmc/api/business/INotifiableManager.java
diff --git a/src/org/xbmc/api/business/ISortableManager.java b/XBMCRemote/src/org/xbmc/api/business/ISortableManager.java
similarity index 100%
rename from src/org/xbmc/api/business/ISortableManager.java
rename to XBMCRemote/src/org/xbmc/api/business/ISortableManager.java
diff --git a/src/org/xbmc/api/business/ITvShowManager.java b/XBMCRemote/src/org/xbmc/api/business/ITvShowManager.java
similarity index 100%
rename from src/org/xbmc/api/business/ITvShowManager.java
rename to XBMCRemote/src/org/xbmc/api/business/ITvShowManager.java
diff --git a/src/org/xbmc/api/business/IVideoManager.java b/XBMCRemote/src/org/xbmc/api/business/IVideoManager.java
similarity index 100%
rename from src/org/xbmc/api/business/IVideoManager.java
rename to XBMCRemote/src/org/xbmc/api/business/IVideoManager.java
diff --git a/src/org/xbmc/api/data/IClient.java b/XBMCRemote/src/org/xbmc/api/data/IClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IClient.java
diff --git a/src/org/xbmc/api/data/IControlClient.java b/XBMCRemote/src/org/xbmc/api/data/IControlClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IControlClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IControlClient.java
diff --git a/src/org/xbmc/api/data/IEventClient.java b/XBMCRemote/src/org/xbmc/api/data/IEventClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IEventClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IEventClient.java
diff --git a/src/org/xbmc/api/data/IInfoClient.java b/XBMCRemote/src/org/xbmc/api/data/IInfoClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IInfoClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IInfoClient.java
diff --git a/src/org/xbmc/api/data/IMusicClient.java b/XBMCRemote/src/org/xbmc/api/data/IMusicClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IMusicClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IMusicClient.java
diff --git a/src/org/xbmc/api/data/IPictureClient.java b/XBMCRemote/src/org/xbmc/api/data/IPictureClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IPictureClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IPictureClient.java
diff --git a/src/org/xbmc/api/data/ITvShowClient.java b/XBMCRemote/src/org/xbmc/api/data/ITvShowClient.java
similarity index 100%
rename from src/org/xbmc/api/data/ITvShowClient.java
rename to XBMCRemote/src/org/xbmc/api/data/ITvShowClient.java
diff --git a/src/org/xbmc/api/data/IVideoClient.java b/XBMCRemote/src/org/xbmc/api/data/IVideoClient.java
similarity index 100%
rename from src/org/xbmc/api/data/IVideoClient.java
rename to XBMCRemote/src/org/xbmc/api/data/IVideoClient.java
diff --git a/src/org/xbmc/api/info/FileTypes.java b/XBMCRemote/src/org/xbmc/api/info/FileTypes.java
similarity index 100%
rename from src/org/xbmc/api/info/FileTypes.java
rename to XBMCRemote/src/org/xbmc/api/info/FileTypes.java
diff --git a/src/org/xbmc/api/info/GuiActions.java b/XBMCRemote/src/org/xbmc/api/info/GuiActions.java
similarity index 100%
rename from src/org/xbmc/api/info/GuiActions.java
rename to XBMCRemote/src/org/xbmc/api/info/GuiActions.java
diff --git a/src/org/xbmc/api/info/GuiSettings.java b/XBMCRemote/src/org/xbmc/api/info/GuiSettings.java
similarity index 100%
rename from src/org/xbmc/api/info/GuiSettings.java
rename to XBMCRemote/src/org/xbmc/api/info/GuiSettings.java
diff --git a/src/org/xbmc/api/info/MusicInfo.java b/XBMCRemote/src/org/xbmc/api/info/MusicInfo.java
similarity index 100%
rename from src/org/xbmc/api/info/MusicInfo.java
rename to XBMCRemote/src/org/xbmc/api/info/MusicInfo.java
diff --git a/src/org/xbmc/api/info/PlayStatus.java b/XBMCRemote/src/org/xbmc/api/info/PlayStatus.java
similarity index 100%
rename from src/org/xbmc/api/info/PlayStatus.java
rename to XBMCRemote/src/org/xbmc/api/info/PlayStatus.java
diff --git a/src/org/xbmc/api/info/SystemInfo.java b/XBMCRemote/src/org/xbmc/api/info/SystemInfo.java
similarity index 100%
rename from src/org/xbmc/api/info/SystemInfo.java
rename to XBMCRemote/src/org/xbmc/api/info/SystemInfo.java
diff --git a/src/org/xbmc/api/info/VideoInfo.java b/XBMCRemote/src/org/xbmc/api/info/VideoInfo.java
similarity index 100%
rename from src/org/xbmc/api/info/VideoInfo.java
rename to XBMCRemote/src/org/xbmc/api/info/VideoInfo.java
diff --git a/src/org/xbmc/api/object/Actor.java b/XBMCRemote/src/org/xbmc/api/object/Actor.java
similarity index 100%
rename from src/org/xbmc/api/object/Actor.java
rename to XBMCRemote/src/org/xbmc/api/object/Actor.java
diff --git a/src/org/xbmc/api/object/Album.java b/XBMCRemote/src/org/xbmc/api/object/Album.java
similarity index 100%
rename from src/org/xbmc/api/object/Album.java
rename to XBMCRemote/src/org/xbmc/api/object/Album.java
diff --git a/src/org/xbmc/api/object/Artist.java b/XBMCRemote/src/org/xbmc/api/object/Artist.java
similarity index 100%
rename from src/org/xbmc/api/object/Artist.java
rename to XBMCRemote/src/org/xbmc/api/object/Artist.java
diff --git a/src/org/xbmc/api/object/Episode.java b/XBMCRemote/src/org/xbmc/api/object/Episode.java
similarity index 100%
rename from src/org/xbmc/api/object/Episode.java
rename to XBMCRemote/src/org/xbmc/api/object/Episode.java
diff --git a/src/org/xbmc/api/object/FileLocation.java b/XBMCRemote/src/org/xbmc/api/object/FileLocation.java
similarity index 100%
rename from src/org/xbmc/api/object/FileLocation.java
rename to XBMCRemote/src/org/xbmc/api/object/FileLocation.java
diff --git a/src/org/xbmc/api/object/Genre.java b/XBMCRemote/src/org/xbmc/api/object/Genre.java
similarity index 100%
rename from src/org/xbmc/api/object/Genre.java
rename to XBMCRemote/src/org/xbmc/api/object/Genre.java
diff --git a/src/org/xbmc/api/object/Host.java b/XBMCRemote/src/org/xbmc/api/object/Host.java
similarity index 100%
rename from src/org/xbmc/api/object/Host.java
rename to XBMCRemote/src/org/xbmc/api/object/Host.java
diff --git a/src/org/xbmc/api/object/ICoverArt.java b/XBMCRemote/src/org/xbmc/api/object/ICoverArt.java
similarity index 100%
rename from src/org/xbmc/api/object/ICoverArt.java
rename to XBMCRemote/src/org/xbmc/api/object/ICoverArt.java
diff --git a/src/org/xbmc/api/object/INamedResource.java b/XBMCRemote/src/org/xbmc/api/object/INamedResource.java
similarity index 100%
rename from src/org/xbmc/api/object/INamedResource.java
rename to XBMCRemote/src/org/xbmc/api/object/INamedResource.java
diff --git a/src/org/xbmc/api/object/Movie.java b/XBMCRemote/src/org/xbmc/api/object/Movie.java
similarity index 100%
rename from src/org/xbmc/api/object/Movie.java
rename to XBMCRemote/src/org/xbmc/api/object/Movie.java
diff --git a/src/org/xbmc/api/object/Season.java b/XBMCRemote/src/org/xbmc/api/object/Season.java
similarity index 100%
rename from src/org/xbmc/api/object/Season.java
rename to XBMCRemote/src/org/xbmc/api/object/Season.java
diff --git a/src/org/xbmc/api/object/Song.java b/XBMCRemote/src/org/xbmc/api/object/Song.java
similarity index 100%
rename from src/org/xbmc/api/object/Song.java
rename to XBMCRemote/src/org/xbmc/api/object/Song.java
diff --git a/src/org/xbmc/api/object/TvShow.java b/XBMCRemote/src/org/xbmc/api/object/TvShow.java
similarity index 100%
rename from src/org/xbmc/api/object/TvShow.java
rename to XBMCRemote/src/org/xbmc/api/object/TvShow.java
diff --git a/src/org/xbmc/api/presentation/INotifiableController.java b/XBMCRemote/src/org/xbmc/api/presentation/INotifiableController.java
similarity index 100%
rename from src/org/xbmc/api/presentation/INotifiableController.java
rename to XBMCRemote/src/org/xbmc/api/presentation/INotifiableController.java
diff --git a/src/org/xbmc/api/type/CacheType.java b/XBMCRemote/src/org/xbmc/api/type/CacheType.java
similarity index 100%
rename from src/org/xbmc/api/type/CacheType.java
rename to XBMCRemote/src/org/xbmc/api/type/CacheType.java
diff --git a/src/org/xbmc/api/type/DirectoryMask.java b/XBMCRemote/src/org/xbmc/api/type/DirectoryMask.java
similarity index 100%
rename from src/org/xbmc/api/type/DirectoryMask.java
rename to XBMCRemote/src/org/xbmc/api/type/DirectoryMask.java
diff --git a/src/org/xbmc/api/type/ListType.java b/XBMCRemote/src/org/xbmc/api/type/ListType.java
similarity index 100%
rename from src/org/xbmc/api/type/ListType.java
rename to XBMCRemote/src/org/xbmc/api/type/ListType.java
diff --git a/src/org/xbmc/api/type/LogType.java b/XBMCRemote/src/org/xbmc/api/type/LogType.java
similarity index 100%
rename from src/org/xbmc/api/type/LogType.java
rename to XBMCRemote/src/org/xbmc/api/type/LogType.java
diff --git a/src/org/xbmc/api/type/MediaType.java b/XBMCRemote/src/org/xbmc/api/type/MediaType.java
similarity index 100%
rename from src/org/xbmc/api/type/MediaType.java
rename to XBMCRemote/src/org/xbmc/api/type/MediaType.java
diff --git a/src/org/xbmc/api/type/SeekType.java b/XBMCRemote/src/org/xbmc/api/type/SeekType.java
similarity index 100%
rename from src/org/xbmc/api/type/SeekType.java
rename to XBMCRemote/src/org/xbmc/api/type/SeekType.java
diff --git a/src/org/xbmc/api/type/SortType.java b/XBMCRemote/src/org/xbmc/api/type/SortType.java
similarity index 100%
rename from src/org/xbmc/api/type/SortType.java
rename to XBMCRemote/src/org/xbmc/api/type/SortType.java
diff --git a/src/org/xbmc/api/type/ThumbSize.java b/XBMCRemote/src/org/xbmc/api/type/ThumbSize.java
similarity index 100%
rename from src/org/xbmc/api/type/ThumbSize.java
rename to XBMCRemote/src/org/xbmc/api/type/ThumbSize.java
diff --git a/src/org/xbmc/eventclient/ButtonCodes.java b/XBMCRemote/src/org/xbmc/eventclient/ButtonCodes.java
similarity index 100%
rename from src/org/xbmc/eventclient/ButtonCodes.java
rename to XBMCRemote/src/org/xbmc/eventclient/ButtonCodes.java
diff --git a/src/org/xbmc/eventclient/EventClient.java b/XBMCRemote/src/org/xbmc/eventclient/EventClient.java
similarity index 100%
rename from src/org/xbmc/eventclient/EventClient.java
rename to XBMCRemote/src/org/xbmc/eventclient/EventClient.java
diff --git a/src/org/xbmc/eventclient/Packet.java b/XBMCRemote/src/org/xbmc/eventclient/Packet.java
similarity index 100%
rename from src/org/xbmc/eventclient/Packet.java
rename to XBMCRemote/src/org/xbmc/eventclient/Packet.java
diff --git a/src/org/xbmc/eventclient/PacketACTION.java b/XBMCRemote/src/org/xbmc/eventclient/PacketACTION.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketACTION.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketACTION.java
diff --git a/src/org/xbmc/eventclient/PacketBUTTON.java b/XBMCRemote/src/org/xbmc/eventclient/PacketBUTTON.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketBUTTON.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketBUTTON.java
diff --git a/src/org/xbmc/eventclient/PacketBYE.java b/XBMCRemote/src/org/xbmc/eventclient/PacketBYE.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketBYE.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketBYE.java
diff --git a/src/org/xbmc/eventclient/PacketHELO.java b/XBMCRemote/src/org/xbmc/eventclient/PacketHELO.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketHELO.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketHELO.java
diff --git a/src/org/xbmc/eventclient/PacketLOG.java b/XBMCRemote/src/org/xbmc/eventclient/PacketLOG.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketLOG.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketLOG.java
diff --git a/src/org/xbmc/eventclient/PacketMOUSE.java b/XBMCRemote/src/org/xbmc/eventclient/PacketMOUSE.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketMOUSE.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketMOUSE.java
diff --git a/src/org/xbmc/eventclient/PacketNOTIFICATION.java b/XBMCRemote/src/org/xbmc/eventclient/PacketNOTIFICATION.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketNOTIFICATION.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketNOTIFICATION.java
diff --git a/src/org/xbmc/eventclient/PacketPING.java b/XBMCRemote/src/org/xbmc/eventclient/PacketPING.java
similarity index 100%
rename from src/org/xbmc/eventclient/PacketPING.java
rename to XBMCRemote/src/org/xbmc/eventclient/PacketPING.java
diff --git a/src/org/xbmc/httpapi/BroadcastListener.java b/XBMCRemote/src/org/xbmc/httpapi/BroadcastListener.java
similarity index 100%
rename from src/org/xbmc/httpapi/BroadcastListener.java
rename to XBMCRemote/src/org/xbmc/httpapi/BroadcastListener.java
diff --git a/src/org/xbmc/httpapi/Connection.java b/XBMCRemote/src/org/xbmc/httpapi/Connection.java
similarity index 100%
rename from src/org/xbmc/httpapi/Connection.java
rename to XBMCRemote/src/org/xbmc/httpapi/Connection.java
diff --git a/src/org/xbmc/httpapi/HttpApi.java b/XBMCRemote/src/org/xbmc/httpapi/HttpApi.java
similarity index 100%
rename from src/org/xbmc/httpapi/HttpApi.java
rename to XBMCRemote/src/org/xbmc/httpapi/HttpApi.java
diff --git a/src/org/xbmc/httpapi/NoNetworkException.java b/XBMCRemote/src/org/xbmc/httpapi/NoNetworkException.java
similarity index 100%
rename from src/org/xbmc/httpapi/NoNetworkException.java
rename to XBMCRemote/src/org/xbmc/httpapi/NoNetworkException.java
diff --git a/src/org/xbmc/httpapi/NoSettingsException.java b/XBMCRemote/src/org/xbmc/httpapi/NoSettingsException.java
similarity index 100%
rename from src/org/xbmc/httpapi/NoSettingsException.java
rename to XBMCRemote/src/org/xbmc/httpapi/NoSettingsException.java
diff --git a/src/org/xbmc/httpapi/WifiStateException.java b/XBMCRemote/src/org/xbmc/httpapi/WifiStateException.java
similarity index 100%
rename from src/org/xbmc/httpapi/WifiStateException.java
rename to XBMCRemote/src/org/xbmc/httpapi/WifiStateException.java
diff --git a/src/org/xbmc/httpapi/WrongDataFormatException.java b/XBMCRemote/src/org/xbmc/httpapi/WrongDataFormatException.java
similarity index 100%
rename from src/org/xbmc/httpapi/WrongDataFormatException.java
rename to XBMCRemote/src/org/xbmc/httpapi/WrongDataFormatException.java
diff --git a/src/org/xbmc/httpapi/client/Client.java b/XBMCRemote/src/org/xbmc/httpapi/client/Client.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/Client.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/Client.java
diff --git a/src/org/xbmc/httpapi/client/ControlClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/ControlClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/ControlClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/ControlClient.java
diff --git a/src/org/xbmc/httpapi/client/InfoClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/InfoClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/InfoClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/InfoClient.java
diff --git a/src/org/xbmc/httpapi/client/MusicClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/MusicClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/MusicClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/MusicClient.java
diff --git a/src/org/xbmc/httpapi/client/PictureClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/PictureClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/PictureClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/PictureClient.java
diff --git a/src/org/xbmc/httpapi/client/TvShowClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/TvShowClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/TvShowClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/TvShowClient.java
diff --git a/src/org/xbmc/httpapi/client/VideoClient.java b/XBMCRemote/src/org/xbmc/httpapi/client/VideoClient.java
similarity index 100%
rename from src/org/xbmc/httpapi/client/VideoClient.java
rename to XBMCRemote/src/org/xbmc/httpapi/client/VideoClient.java
diff --git a/src/org/xbmc/jsonrpc/Connection.java b/XBMCRemote/src/org/xbmc/jsonrpc/Connection.java
similarity index 100%
rename from src/org/xbmc/jsonrpc/Connection.java
rename to XBMCRemote/src/org/xbmc/jsonrpc/Connection.java
diff --git a/src/org/xbmc/jsonrpc/JsonRpc.java b/XBMCRemote/src/org/xbmc/jsonrpc/JsonRpc.java
similarity index 100%
rename from src/org/xbmc/jsonrpc/JsonRpc.java
rename to XBMCRemote/src/org/xbmc/jsonrpc/JsonRpc.java
diff --git a/src/org/xbmc/jsonrpc/client/Client.java b/XBMCRemote/src/org/xbmc/jsonrpc/client/Client.java
similarity index 100%
rename from src/org/xbmc/jsonrpc/client/Client.java
rename to XBMCRemote/src/org/xbmc/jsonrpc/client/Client.java
diff --git a/src/org/xbmc/jsonrpc/client/InfoClient.java b/XBMCRemote/src/org/xbmc/jsonrpc/client/InfoClient.java
similarity index 100%
rename from src/org/xbmc/jsonrpc/client/InfoClient.java
rename to XBMCRemote/src/org/xbmc/jsonrpc/client/InfoClient.java
diff --git a/src/org/xbmc/jsonrpc/client/MusicClient.java b/XBMCRemote/src/org/xbmc/jsonrpc/client/MusicClient.java
similarity index 100%
rename from src/org/xbmc/jsonrpc/client/MusicClient.java
rename to XBMCRemote/src/org/xbmc/jsonrpc/client/MusicClient.java
diff --git a/src/org/xbmc/android/util/PowerDown.java b/XBMCRemote/src/src/org/xbmc/android/util/PowerDown.java
similarity index 100%
rename from src/org/xbmc/android/util/PowerDown.java
rename to XBMCRemote/src/src/org/xbmc/android/util/PowerDown.java
diff --git a/xbmc-remote-sign.keystore b/XBMCRemote/xbmc-remote-sign.keystore
similarity index 100%
rename from xbmc-remote-sign.keystore
rename to XBMCRemote/xbmc-remote-sign.keystore