AudioFX: finish rename; persist process

- Set persistent flag for app in the manifest, this backing process shouldn't be
  dying when the user swipes away the UI

- Fix package structure to be org.cyanogenmod.audiofx

- Add missing java license headers

Change-Id: I03d37b6ca0548d881aaf46754c776da923e1ef59

44 files changed, 670 insertions, 246 deletions

diff --git a/src/org/cyanogenmod/audiofx/audiofx/AudioFxApplication.java b/src/org/cyanogenmod/audiofx/AudioFxApplication.java
index fa47637..9f08a0c 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/AudioFxApplication.java
+++ b/src/org/cyanogenmod/audiofx/AudioFxApplication.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.audiofx;
+package org.cyanogenmod.audiofx;
 
 import android.app.Application;
 import android.util.Log;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/Compatibility.java b/src/org/cyanogenmod/audiofx/Compatibility.java
index 313c480..9f8f5c4 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/Compatibility.java
+++ b/src/org/cyanogenmod/audiofx/Compatibility.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyngn.audiofx;
+package org.cyanogenmod.audiofx;
 
 import android.app.Activity;
 import android.app.IntentService;
@@ -30,8 +30,7 @@ import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
-import com.cyngn.audiofx.activity.ActivityMusic;
-import com.cyngn.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.activity.ActivityMusic;
 
 import java.util.List;
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/Constants.java b/src/org/cyanogenmod/audiofx/Constants.java
index c1d5475..4c1fafb 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/Constants.java
+++ b/src/org/cyanogenmod/audiofx/Constants.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.audiofx;
+package org.cyanogenmod.audiofx;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import com.cyngn.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.eq.EqUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/Preset.java b/src/org/cyanogenmod/audiofx/Preset.java
index e284658..b6f63b9 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/Preset.java
+++ b/src/org/cyanogenmod/audiofx/Preset.java
@@ -1,8 +1,23 @@
-package com.cyngn.audiofx;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import com.cyngn.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.eq.EqUtils;
 
 public class Preset implements Parcelable {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/activity/ActivityMusic.java b/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java
index 9e312c2..bd12702 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/activity/ActivityMusic.java
+++ b/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.activity;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.activity;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -14,14 +29,14 @@ import android.view.ViewStub;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import com.cyanogen.ambient.analytics.Event;
-import com.cyngn.audiofx.AudioFxApplication;
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.fragment.AudioFxFragment;
-import com.cyngn.audiofx.knobs.KnobCommander;
-import com.cyngn.audiofx.service.AudioFxService;
-import com.cyngn.audiofx.stats.AppState;
-import com.cyngn.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.AudioFxApplication;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.fragment.AudioFxFragment;
+import org.cyanogenmod.audiofx.knobs.KnobCommander;
+import org.cyanogenmod.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.stats.AppState;
+import org.cyanogenmod.audiofx.stats.UserSession;
 
 public class ActivityMusic extends Activity {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/activity/ControlPanelPicker.java b/src/org/cyanogenmod/audiofx/activity/ControlPanelPicker.java
index a9fd876..03e6b06 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/activity/ControlPanelPicker.java
+++ b/src/org/cyanogenmod/audiofx/activity/ControlPanelPicker.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyngn.audiofx.activity;
+package org.cyanogenmod.audiofx.activity;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.internal.app.AlertController.AlertParams.OnPrepareListViewListener;
-import com.cyngn.audiofx.Compatibility;
-import com.cyngn.audiofx.Compatibility.Service;
+import org.cyanogenmod.audiofx.Compatibility;
+import org.cyanogenmod.audiofx.Compatibility.Service;
 
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -33,7 +33,7 @@ import android.database.MatrixCursor;
 import android.media.audiofx.AudioEffect;
 import android.os.Bundle;
 import android.widget.ListView;
-import com.cyngn.audiofx.R;
+import org.cyanogenmod.audiofx.R;
 
 import java.util.List;
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/activity/EqualizerManager.java b/src/org/cyanogenmod/audiofx/activity/EqualizerManager.java
index 03e9853..b040b71 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/activity/EqualizerManager.java
+++ b/src/org/cyanogenmod/audiofx/activity/EqualizerManager.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.activity;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.activity;
 
 import android.content.Context;
 import android.os.Handler;
@@ -6,12 +21,12 @@ import android.os.Message;
 import android.util.Log;
 import android.widget.CompoundButton;
 
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.Preset;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.eq.EqUtils;
-import com.cyngn.audiofx.service.AudioFxService;
-import com.cyngn.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.Preset;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.stats.UserSession;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/activity/MasterConfigControl.java b/src/org/cyanogenmod/audiofx/activity/MasterConfigControl.java
index d83d0de..1c5ac0c 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/activity/MasterConfigControl.java
+++ b/src/org/cyanogenmod/audiofx/activity/MasterConfigControl.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.activity;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.activity;
 
 import static android.media.AudioDeviceInfo.TYPE_BLUETOOTH_A2DP;
 import static android.media.AudioDeviceInfo.TYPE_BLUETOOTH_SCO;
@@ -25,8 +40,8 @@ import android.os.IBinder;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.service.AudioFxService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -302,10 +317,10 @@ public class MasterConfigControl {
         switch (type) {
             case TYPE_WIRED_HEADSET:
             case TYPE_WIRED_HEADPHONES:
-                return context.getString(com.cyngn.audiofx.R.string.device_headset);
+                return context.getString(org.cyanogenmod.audiofx.R.string.device_headset);
             case TYPE_LINE_ANALOG:
             case TYPE_LINE_DIGITAL:
-                return context.getString(com.cyngn.audiofx.R.string.device_line_out);
+                return context.getString(org.cyanogenmod.audiofx.R.string.device_line_out);
             case TYPE_BLUETOOTH_SCO:
             case TYPE_BLUETOOTH_A2DP:
             case TYPE_USB_DEVICE:
@@ -314,7 +329,7 @@ public class MasterConfigControl {
             case TYPE_IP:
                 return info.getProductName().toString();
             default:
-                return context.getString(com.cyngn.audiofx.R.string.device_speaker);
+                return context.getString(org.cyanogenmod.audiofx.R.string.device_speaker);
         }
     }
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/activity/StateCallbacks.java b/src/org/cyanogenmod/audiofx/activity/StateCallbacks.java
index 0aa7379..0196b15 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/activity/StateCallbacks.java
+++ b/src/org/cyanogenmod/audiofx/activity/StateCallbacks.java
@@ -1,5 +1,19 @@
-
-package com.cyngn.audiofx.activity;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.activity;
 
 import android.media.AudioDeviceInfo;
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/backends/IEffectFactory.java b/src/org/cyanogenmod/audiofx/audiofx/backends/IEffectFactory.java
deleted file mode 100644
index 8e629b8..0000000
--- a/src/org/cyanogenmod/audiofx/audiofx/backends/IEffectFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cyngn.audiofx.backends;
-
-import android.content.Context;
-import android.media.AudioDeviceInfo;
-
-interface IEffectFactory {
-
-    /**
-     * Create a new EffectSet based on current stream parameters.
-     * @param context context to create the effect with
-     * @param sessionId session id to attach the effect to
-     * @param currentDevice current device that the effect should initially setup for
-     * @return an {@link EffectSet}
-     */
-    EffectSet createEffectSet(Context context, int sessionId, AudioDeviceInfo currentDevice);
-}
diff --git a/src/org/cyanogenmod/audiofx/audiofx/service/BootReceiver.java b/src/org/cyanogenmod/audiofx/audiofx/service/BootReceiver.java
deleted file mode 100644
index df853a5..0000000
--- a/src/org/cyanogenmod/audiofx/audiofx/service/BootReceiver.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.cyngn.audiofx.service;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import com.cyngn.audiofx.Constants;
-
-public class BootReceiver extends BroadcastReceiver {
-    public void onReceive(Context context, Intent intent) {
-        final Intent service = new Intent(context.getApplicationContext(), AudioFxService.class);
-        context.startService(service);
-    }
-}
diff --git a/src/org/cyanogenmod/audiofx/audiofx/backends/AndroidEffects.java b/src/org/cyanogenmod/audiofx/backends/AndroidEffects.java
index 090eb73..fafcd34 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/backends/AndroidEffects.java
+++ b/src/org/cyanogenmod/audiofx/backends/AndroidEffects.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.backends;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.backends;
 
 import android.media.AudioDeviceInfo;
 import android.media.audiofx.AudioEffect;
@@ -7,7 +22,7 @@ import android.media.audiofx.PresetReverb;
 import android.media.audiofx.Virtualizer;
 import android.util.Log;
 
-import com.cyngn.audiofx.Constants;
+import org.cyanogenmod.audiofx.Constants;
 
 /**
  * EffectSet which comprises standard Android effects
diff --git a/src/org/cyanogenmod/audiofx/audiofx/backends/EffectSet.java b/src/org/cyanogenmod/audiofx/backends/EffectSet.java
index 47ae894..2d336b9 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/backends/EffectSet.java
+++ b/src/org/cyanogenmod/audiofx/backends/EffectSet.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.backends;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.backends;
 
 import android.media.AudioDeviceInfo;
 import android.util.Log;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/backends/EffectSetWithAndroidEq.java b/src/org/cyanogenmod/audiofx/backends/EffectSetWithAndroidEq.java
index 81cd53c..42d1cca 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/backends/EffectSetWithAndroidEq.java
+++ b/src/org/cyanogenmod/audiofx/backends/EffectSetWithAndroidEq.java
@@ -1,14 +1,26 @@
-package com.cyngn.audiofx.backends;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.backends;
 
 import android.media.AudioDeviceInfo;
 import android.media.audiofx.Equalizer;
 import android.util.Log;
 
-import com.cyngn.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.eq.EqUtils;
 
-/**
- * Created by roman on 3/1/16.
- */
 public abstract class EffectSetWithAndroidEq extends EffectSet {
     /**
      * Session-specific equalizer
diff --git a/src/org/cyanogenmod/audiofx/backends/IEffectFactory.java b/src/org/cyanogenmod/audiofx/backends/IEffectFactory.java
new file mode 100644
index 0000000..c427dee
--- /dev/null
+++ b/src/org/cyanogenmod/audiofx/backends/IEffectFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.backends;
+
+import android.content.Context;
+import android.media.AudioDeviceInfo;
+
+interface IEffectFactory {
+
+    /**
+     * Create a new EffectSet based on current stream parameters.
+     * @param context context to create the effect with
+     * @param sessionId session id to attach the effect to
+     * @param currentDevice current device that the effect should initially setup for
+     * @return an {@link EffectSet}
+     */
+    EffectSet createEffectSet(Context context, int sessionId, AudioDeviceInfo currentDevice);
+}
diff --git a/src/org/cyanogenmod/audiofx/audiofx/eq/EqBarView.java b/src/org/cyanogenmod/audiofx/eq/EqBarView.java
index df697dd..445b031 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/eq/EqBarView.java
+++ b/src/org/cyanogenmod/audiofx/eq/EqBarView.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.eq;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.eq;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -7,10 +22,10 @@ import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.activity.StateCallbacks;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.StateCallbacks;
 
 public class EqBarView extends FrameLayout implements StateCallbacks.EqUpdatedCallback {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/eq/EqContainerView.java b/src/org/cyanogenmod/audiofx/eq/EqContainerView.java
index 51b58a6..39146da 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/eq/EqContainerView.java
+++ b/src/org/cyanogenmod/audiofx/eq/EqContainerView.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.eq;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.eq;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -23,10 +38,10 @@ import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.activity.StateCallbacks;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.StateCallbacks;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/eq/EqSwipeController.java b/src/org/cyanogenmod/audiofx/eq/EqSwipeController.java
index e96d944..5573de6 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/eq/EqSwipeController.java
+++ b/src/org/cyanogenmod/audiofx/eq/EqSwipeController.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.eq;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.eq;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -9,10 +24,10 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.preset.InfiniteViewPager;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.preset.InfiniteViewPager;
 
 public class EqSwipeController extends LinearLayout {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/eq/EqUtils.java b/src/org/cyanogenmod/audiofx/eq/EqUtils.java
index 30d546c..85704d8 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/eq/EqUtils.java
+++ b/src/org/cyanogenmod/audiofx/eq/EqUtils.java
@@ -1,14 +1,23 @@
-package com.cyngn.audiofx.eq;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.eq;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.util.Log;
 
-import com.cyngn.audiofx.Preset;
-
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 public class EqUtils {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/fragment/AudioFxBaseFragment.java b/src/org/cyanogenmod/audiofx/fragment/AudioFxBaseFragment.java
index d487ff0..4cca509 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/fragment/AudioFxBaseFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/AudioFxBaseFragment.java
@@ -1,11 +1,26 @@
-package com.cyngn.audiofx.fragment;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.fragment;
 
 import android.animation.Animator;
 import android.app.Fragment;
 import android.os.Bundle;
 import android.widget.CompoundButton;
-import com.cyngn.audiofx.activity.ActivityMusic;
-import com.cyngn.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.ActivityMusic;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
 
 public class AudioFxBaseFragment extends Fragment {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/fragment/AudioFxFragment.java b/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java
index 2c9c5f5..582e3d6 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/fragment/AudioFxFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.fragment;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.fragment;
 
 import android.animation.Animator;
 import android.animation.ArgbEvaluator;
@@ -23,15 +38,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
-import com.cyngn.audiofx.Compatibility;
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.ActivityMusic;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.activity.StateCallbacks;
-import com.cyngn.audiofx.stats.UserSession;
-import com.cyngn.audiofx.widget.InterceptableLinearLayout;
+import org.cyanogenmod.audiofx.Compatibility;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.ActivityMusic;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.StateCallbacks;
+import org.cyanogenmod.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.widget.InterceptableLinearLayout;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/fragment/ControlsFragment.java b/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java
index 02e7077..4a0eed6 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/fragment/ControlsFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.fragment;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.fragment;
 
 import android.annotation.Nullable;
 import android.media.AudioDeviceInfo;
@@ -10,11 +25,11 @@ import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.knobs.KnobCommander;
-import com.cyngn.audiofx.knobs.KnobContainer;
-import com.cyngn.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.knobs.KnobCommander;
+import org.cyanogenmod.audiofx.knobs.KnobContainer;
+import org.cyanogenmod.audiofx.stats.UserSession;
 
 public class ControlsFragment extends AudioFxBaseFragment {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/fragment/EqualizerFragment.java b/src/org/cyanogenmod/audiofx/fragment/EqualizerFragment.java
index 2d4a9b2..0f95365 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/fragment/EqualizerFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/EqualizerFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.fragment;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.fragment;
 
 import android.animation.Animator;
 import android.animation.ArgbEvaluator;
@@ -22,19 +37,17 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.cyngn.audiofx.Preset;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.activity.StateCallbacks;
-import com.cyngn.audiofx.eq.EqContainerView;
-import com.cyngn.audiofx.preset.InfinitePagerAdapter;
-import com.cyngn.audiofx.preset.InfiniteViewPager;
-import com.cyngn.audiofx.preset.PresetPagerAdapter;
-import com.cyngn.audiofx.stats.UserSession;
-import com.cyngn.audiofx.viewpagerindicator.CirclePageIndicator;
-
-import java.util.Arrays;
+import org.cyanogenmod.audiofx.Preset;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.StateCallbacks;
+import org.cyanogenmod.audiofx.eq.EqContainerView;
+import org.cyanogenmod.audiofx.preset.InfinitePagerAdapter;
+import org.cyanogenmod.audiofx.preset.InfiniteViewPager;
+import org.cyanogenmod.audiofx.preset.PresetPagerAdapter;
+import org.cyanogenmod.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.viewpagerindicator.CirclePageIndicator;
 
 public class EqualizerFragment extends AudioFxBaseFragment
         implements StateCallbacks.DeviceChangedCallback, StateCallbacks.EqUpdatedCallback {
diff --git a/src/org/cyanogenmod/audiofx/audiofx/knobs/KnobCommander.java b/src/org/cyanogenmod/audiofx/knobs/KnobCommander.java
index b045c16..ae7123d 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/knobs/KnobCommander.java
+++ b/src/org/cyanogenmod/audiofx/knobs/KnobCommander.java
@@ -1,9 +1,24 @@
-package com.cyngn.audiofx.knobs;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.knobs;
 
 import android.content.Context;
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.service.AudioFxService;
 
 public class KnobCommander {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/knobs/KnobContainer.java b/src/org/cyanogenmod/audiofx/knobs/KnobContainer.java
index 91e811b..bed4e0f 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/knobs/KnobContainer.java
+++ b/src/org/cyanogenmod/audiofx/knobs/KnobContainer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.audiofx.knobs;
+package org.cyanogenmod.audiofx.knobs;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -31,9 +31,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.activity.StateCallbacks;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.activity.StateCallbacks;
 
 public class KnobContainer extends LinearLayout
         implements StateCallbacks.DeviceChangedCallback {
diff --git a/src/org/cyanogenmod/audiofx/audiofx/knobs/RadialKnob.java b/src/org/cyanogenmod/audiofx/knobs/RadialKnob.java
index 0e4cbb2..9f35835 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/knobs/RadialKnob.java
+++ b/src/org/cyanogenmod/audiofx/knobs/RadialKnob.java
@@ -27,7 +27,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.cyngn.audiofx.knobs;
+package org.cyanogenmod.audiofx.knobs;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -48,8 +48,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.Toast;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.stats.UserSession;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.stats.UserSession;
 
 public class RadialKnob extends View {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/preset/InfinitePagerAdapter.java b/src/org/cyanogenmod/audiofx/preset/InfinitePagerAdapter.java
index 71811f4..e090ea8 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/preset/InfinitePagerAdapter.java
+++ b/src/org/cyanogenmod/audiofx/preset/InfinitePagerAdapter.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.preset;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.preset;
 
 import android.os.Parcelable;
 import android.support.v4.view.PagerAdapter;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/preset/InfiniteViewPager.java b/src/org/cyanogenmod/audiofx/preset/InfiniteViewPager.java
index 8a4ed38..26e67f3 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/preset/InfiniteViewPager.java
+++ b/src/org/cyanogenmod/audiofx/preset/InfiniteViewPager.java
@@ -1,5 +1,19 @@
-package com.cyngn.audiofx.preset;
-
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.preset;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -7,9 +21,9 @@ import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
 
 /**
  * A {@link ViewPager} that allows pseudo-infinite paging with a wrap-around effect. Should be used with an {@link
diff --git a/src/org/cyanogenmod/audiofx/audiofx/preset/PresetPagerAdapter.java b/src/org/cyanogenmod/audiofx/preset/PresetPagerAdapter.java
index f6875f7..d8cd1f0 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/preset/PresetPagerAdapter.java
+++ b/src/org/cyanogenmod/audiofx/preset/PresetPagerAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.audiofx.preset;
+package org.cyanogenmod.audiofx.preset;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -22,10 +22,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.cyngn.audiofx.Preset;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.EqualizerManager;
-import com.cyngn.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.Preset;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.EqualizerManager;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
 
 public class PresetPagerAdapter extends PagerAdapter {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/receiver/QuickSettingsTileReceiver.java b/src/org/cyanogenmod/audiofx/receiver/QuickSettingsTileReceiver.java
index c27d44a..2334d9a 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/receiver/QuickSettingsTileReceiver.java
+++ b/src/org/cyanogenmod/audiofx/receiver/QuickSettingsTileReceiver.java
@@ -1,22 +1,34 @@
-package com.cyngn.audiofx.receiver;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.service.AudioFxService;
 
-/**
- * Created by roman on 1/13/16.
- */
 public class QuickSettingsTileReceiver extends BroadcastReceiver {
 
     private static final boolean DEBUG = false;
     private static final String TAG = "QSTileReceiver";
 
     public static final String ACTION_TOGGLE_CURRENT_DEVICE
-            = "com.cyngn.audiofx.action.TOGGLE_DEVICE";
+            = "org.cyanogenmod.audiofx.action.TOGGLE_DEVICE";
 
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/src/org/cyanogenmod/audiofx/audiofx/receiver/ServiceDispatcher.java b/src/org/cyanogenmod/audiofx/receiver/ServiceDispatcher.java
index 7581ba2..bce6599 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/receiver/ServiceDispatcher.java
+++ b/src/org/cyanogenmod/audiofx/receiver/ServiceDispatcher.java
@@ -1,5 +1,19 @@
-
-package com.cyngn.audiofx.receiver;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -7,7 +21,7 @@ import android.content.Intent;
 import android.media.audiofx.AudioEffect;
 import android.util.Log;
 
-import com.cyngn.audiofx.service.AudioFxService;
+import org.cyanogenmod.audiofx.service.AudioFxService;
 
 import cyanogenmod.media.AudioSessionInfo;
 import cyanogenmod.media.CMAudioManager;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/service/AudioFxService.java b/src/org/cyanogenmod/audiofx/service/AudioFxService.java
index ce158b5..74817c8 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/service/AudioFxService.java
+++ b/src/org/cyanogenmod/audiofx/service/AudioFxService.java
@@ -17,7 +17,7 @@
  *
  * Proprietary and confidential.
  */
-package com.cyngn.audiofx.service;
+package org.cyanogenmod.audiofx.service;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -33,11 +33,11 @@ import android.os.IBinder;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.ActivityMusic;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.backends.EffectSet;
-import com.cyngn.audiofx.receiver.QuickSettingsTileReceiver;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.ActivityMusic;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.backends.EffectSet;
+import org.cyanogenmod.audiofx.receiver.QuickSettingsTileReceiver;
 
 import java.lang.ref.WeakReference;
 import java.util.Locale;
@@ -66,7 +66,7 @@ public class AudioFxService extends Service
     public static final String ACTION_DEVICE_OUTPUT_CHANGED
             = "org.cyanogenmod.audiofx.ACTION_DEVICE_OUTPUT_CHANGED";
 
-    public static final String ACTION_UPDATE_TILE = "com.cyngn.audiofx.action.UPDATE_TILE";
+    public static final String ACTION_UPDATE_TILE = "org.cyanogenmod.audiofx.action.UPDATE_TILE";
 
     public static final String EXTRA_DEVICE = "device";
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/service/AudioOutputChangeListener.java b/src/org/cyanogenmod/audiofx/service/AudioOutputChangeListener.java
index f85d9c1..2b4cc20 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/service/AudioOutputChangeListener.java
+++ b/src/org/cyanogenmod/audiofx/service/AudioOutputChangeListener.java
@@ -1,5 +1,19 @@
-
-package com.cyngn.audiofx.service;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.service;
 
 import static android.media.AudioDeviceInfo.convertDeviceTypeToInternalDevice;
 
diff --git a/src/org/cyanogenmod/audiofx/service/BootReceiver.java b/src/org/cyanogenmod/audiofx/service/BootReceiver.java
new file mode 100644
index 0000000..949eee0
--- /dev/null
+++ b/src/org/cyanogenmod/audiofx/service/BootReceiver.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootReceiver extends BroadcastReceiver {
+    public void onReceive(Context context, Intent intent) {
+        final Intent service = new Intent(context.getApplicationContext(), AudioFxService.class);
+        context.startService(service);
+    }
+}
diff --git a/src/org/cyanogenmod/audiofx/audiofx/service/DevicePreferenceManager.java b/src/org/cyanogenmod/audiofx/service/DevicePreferenceManager.java
index 928209e..f377f3c 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/service/DevicePreferenceManager.java
+++ b/src/org/cyanogenmod/audiofx/service/DevicePreferenceManager.java
@@ -1,28 +1,43 @@
-package com.cyngn.audiofx.service;
-
-import static com.cyngn.audiofx.Constants.AUDIOFX_GLOBAL_FILE;
-import static com.cyngn.audiofx.Constants.AUDIOFX_GLOBAL_HAS_BASSBOOST;
-import static com.cyngn.audiofx.Constants.AUDIOFX_GLOBAL_HAS_DTS;
-import static com.cyngn.audiofx.Constants.AUDIOFX_GLOBAL_HAS_MAXXAUDIO;
-import static com.cyngn.audiofx.Constants.AUDIOFX_GLOBAL_HAS_VIRTUALIZER;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_BASS_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_BASS_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_EQ_PRESET;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_MAXXVOLUME_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_HEADSET;
-import static com.cyngn.audiofx.Constants.DEVICE_SPEAKER;
-import static com.cyngn.audiofx.Constants.EQUALIZER_BAND_LEVEL_RANGE;
-import static com.cyngn.audiofx.Constants.EQUALIZER_CENTER_FREQS;
-import static com.cyngn.audiofx.Constants.EQUALIZER_NUMBER_OF_BANDS;
-import static com.cyngn.audiofx.Constants.EQUALIZER_NUMBER_OF_PRESETS;
-import static com.cyngn.audiofx.Constants.EQUALIZER_PRESET;
-import static com.cyngn.audiofx.Constants.EQUALIZER_PRESET_NAMES;
-import static com.cyngn.audiofx.Constants.SAVED_DEFAULTS;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.service;
+
+import static org.cyanogenmod.audiofx.Constants.AUDIOFX_GLOBAL_FILE;
+import static org.cyanogenmod.audiofx.Constants.AUDIOFX_GLOBAL_HAS_BASSBOOST;
+import static org.cyanogenmod.audiofx.Constants.AUDIOFX_GLOBAL_HAS_DTS;
+import static org.cyanogenmod.audiofx.Constants.AUDIOFX_GLOBAL_HAS_MAXXAUDIO;
+import static org.cyanogenmod.audiofx.Constants.AUDIOFX_GLOBAL_HAS_VIRTUALIZER;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_BASS_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_BASS_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_EQ_PRESET;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_MAXXVOLUME_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_HEADSET;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_SPEAKER;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_BAND_LEVEL_RANGE;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_CENTER_FREQS;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_NUMBER_OF_BANDS;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_NUMBER_OF_PRESETS;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_PRESET;
+import static org.cyanogenmod.audiofx.Constants.EQUALIZER_PRESET_NAMES;
+import static org.cyanogenmod.audiofx.Constants.SAVED_DEFAULTS;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -31,11 +46,11 @@ import android.media.AudioDeviceInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyngn.audiofx.Constants;
-import com.cyngn.audiofx.R;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.backends.EffectSet;
-import com.cyngn.audiofx.backends.EffectsFactory;
+import org.cyanogenmod.audiofx.Constants;
+import org.cyanogenmod.audiofx.R;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.backends.EffectSet;
+import org.cyanogenmod.audiofx.backends.EffectsFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/service/SessionManager.java b/src/org/cyanogenmod/audiofx/service/SessionManager.java
index c744686..540413d 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/service/SessionManager.java
+++ b/src/org/cyanogenmod/audiofx/service/SessionManager.java
@@ -1,25 +1,40 @@
-package com.cyngn.audiofx.service;
-
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_BASS_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_BASS_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_EQ_PRESET_LEVELS;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_MAXXVOLUME_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_REVERB_PRESET;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_ENABLE;
-import static com.cyngn.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_STRENGTH;
-import static com.cyngn.audiofx.Constants.DEVICE_DEFAULT_GLOBAL_ENABLE;
-import static com.cyngn.audiofx.activity.MasterConfigControl.getDeviceIdentifierString;
-import static com.cyngn.audiofx.service.AudioFxService.ALL_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.BASS_BOOST_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.ENABLE_REVERB;
-import static com.cyngn.audiofx.service.AudioFxService.EQ_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.REVERB_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.TREBLE_BOOST_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.VIRTUALIZER_CHANGED;
-import static com.cyngn.audiofx.service.AudioFxService.VOLUME_BOOST_CHANGED;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.service;
+
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_BASS_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_BASS_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_EQ_PRESET_LEVELS;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_MAXXVOLUME_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_REVERB_PRESET;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_TREBLE_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_ENABLE;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_AUDIOFX_VIRTUALIZER_STRENGTH;
+import static org.cyanogenmod.audiofx.Constants.DEVICE_DEFAULT_GLOBAL_ENABLE;
+import static org.cyanogenmod.audiofx.activity.MasterConfigControl.getDeviceIdentifierString;
+import static org.cyanogenmod.audiofx.service.AudioFxService.ALL_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.BASS_BOOST_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.ENABLE_REVERB;
+import static org.cyanogenmod.audiofx.service.AudioFxService.EQ_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.REVERB_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.TREBLE_BOOST_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.VIRTUALIZER_CHANGED;
+import static org.cyanogenmod.audiofx.service.AudioFxService.VOLUME_BOOST_CHANGED;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -33,9 +48,9 @@ import android.os.Message;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.cyngn.audiofx.backends.EffectSet;
-import com.cyngn.audiofx.backends.EffectsFactory;
-import com.cyngn.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.backends.EffectSet;
+import org.cyanogenmod.audiofx.backends.EffectsFactory;
+import org.cyanogenmod.audiofx.eq.EqUtils;
 
 import cyanogenmod.media.AudioSessionInfo;
 import cyanogenmod.media.CMAudioManager;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/stats/AppState.java b/src/org/cyanogenmod/audiofx/stats/AppState.java
index 5417bcd..7ca0c9c 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/stats/AppState.java
+++ b/src/org/cyanogenmod/audiofx/stats/AppState.java
@@ -1,14 +1,26 @@
-package com.cyngn.audiofx.stats;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.stats;
 
 import com.cyanogen.ambient.analytics.Event;
-import com.cyngn.audiofx.Preset;
-import com.cyngn.audiofx.activity.MasterConfigControl;
-import com.cyngn.audiofx.eq.EqUtils;
-import com.cyngn.audiofx.knobs.KnobCommander;
+import org.cyanogenmod.audiofx.Preset;
+import org.cyanogenmod.audiofx.activity.MasterConfigControl;
+import org.cyanogenmod.audiofx.eq.EqUtils;
+import org.cyanogenmod.audiofx.knobs.KnobCommander;
 
-/**
- * Created by roman on 9/29/15.
- */
 public class AppState {
     public static void appendState(MasterConfigControl control,
                                    KnobCommander knobs, Event.Builder builder) {
diff --git a/src/org/cyanogenmod/audiofx/audiofx/stats/UserSession.java b/src/org/cyanogenmod/audiofx/stats/UserSession.java
index bb8787c..285edb3 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/stats/UserSession.java
+++ b/src/org/cyanogenmod/audiofx/stats/UserSession.java
@@ -1,12 +1,25 @@
-package com.cyngn.audiofx.stats;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.stats;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import com.cyanogen.ambient.analytics.Event;
-import com.cyngn.audiofx.Preset;
-import com.cyngn.audiofx.knobs.KnobCommander;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.cyanogenmod.audiofx.Preset;
+import org.cyanogenmod.audiofx.knobs.KnobCommander;
 
 public class UserSession implements Parcelable {
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/viewpagerindicator/CirclePageIndicator.java b/src/org/cyanogenmod/audiofx/viewpagerindicator/CirclePageIndicator.java
index b4b4a6b..cc69325 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/viewpagerindicator/CirclePageIndicator.java
+++ b/src/org/cyanogenmod/audiofx/viewpagerindicator/CirclePageIndicator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.audiofx.viewpagerindicator;
+package org.cyanogenmod.audiofx.viewpagerindicator;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -30,7 +30,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import com.cyngn.audiofx.R;
+import org.cyanogenmod.audiofx.R;
 
 import static android.graphics.Paint.ANTI_ALIAS_FLAG;
 import static android.widget.LinearLayout.HORIZONTAL;
diff --git a/src/org/cyanogenmod/audiofx/audiofx/viewpagerindicator/PageIndicator.java b/src/org/cyanogenmod/audiofx/viewpagerindicator/PageIndicator.java
index 131d53f..51ec418 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/viewpagerindicator/PageIndicator.java
+++ b/src/org/cyanogenmod/audiofx/viewpagerindicator/PageIndicator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyngn.audiofx.viewpagerindicator;
+package org.cyanogenmod.audiofx.viewpagerindicator;
 
 import android.support.v4.view.ViewPager;
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/widget/Biquad.java b/src/org/cyanogenmod/audiofx/widget/Biquad.java
index 4486dfe..9a52d2e 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/widget/Biquad.java
+++ b/src/org/cyanogenmod/audiofx/widget/Biquad.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.widget;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.widget;
 
 /**
  * Evaluate transfer functions of biquad filters in direct form 1.
diff --git a/src/org/cyanogenmod/audiofx/audiofx/widget/Complex.java b/src/org/cyanogenmod/audiofx/widget/Complex.java
index dbbaaf2..64c4a85 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/widget/Complex.java
+++ b/src/org/cyanogenmod/audiofx/widget/Complex.java
@@ -1,4 +1,19 @@
-package com.cyngn.audiofx.widget;
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.cyanogenmod.audiofx.widget;
 
 /**
  * Java support for complex numbers.
diff --git a/src/org/cyanogenmod/audiofx/audiofx/widget/EqualizerSurface.java b/src/org/cyanogenmod/audiofx/widget/EqualizerSurface.java
index 2b3c637..6644643 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/widget/EqualizerSurface.java
+++ b/src/org/cyanogenmod/audiofx/widget/EqualizerSurface.java
@@ -17,7 +17,7 @@
  * - Modified extensively by cyanogen for multi-band support
  */
 
-package com.cyngn.audiofx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -38,7 +38,7 @@ import android.view.SurfaceView;
 import android.view.View;
 
 import android.view.animation.DecelerateInterpolator;
-import com.cyngn.audiofx.R;
+import org.cyanogenmod.audiofx.R;
 
 import java.util.Arrays;
 
diff --git a/src/org/cyanogenmod/audiofx/audiofx/widget/InterceptableLinearLayout.java b/src/org/cyanogenmod/audiofx/widget/InterceptableLinearLayout.java
index ae0e8a0..d2d62e1 100644
--- a/src/org/cyanogenmod/audiofx/audiofx/widget/InterceptableLinearLayout.java
+++ b/src/org/cyanogenmod/audiofx/widget/InterceptableLinearLayout.java
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.cyngn.audiofx.widget;
+package org.cyanogenmod.audiofx.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;