diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c566fb9..0070fc3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
         android:largeHeap="true"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
+            android:name=".view.MainActivity"
             android:label="@string/main_activity_label" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
@@ -65,11 +65,11 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".PlayActivity"
+            android:name=".view.PlayActivity"
             android:label="@string/title_activity_play" >
         </activity>
         <activity
-            android:name=".LoroClipEditActivity"
+            android:name=".view.LoroClipEditActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize" >
@@ -80,7 +80,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".LoginActivity"
+            android:name=".view.LoginActivity"
             android:label="@string/main_activity_label" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -94,7 +94,7 @@
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
-            android:name=".record.RecordActivity"
+            android:name=".view.RecordActivity"
             android:label="@string/title_activity_record" >
         </activity>
 
diff --git a/app/src/main/java/com/loroclip/Authenticator.java b/app/src/main/java/com/loroclip/Authenticator.java
index ace6b95..ed02abc 100644
--- a/app/src/main/java/com/loroclip/Authenticator.java
+++ b/app/src/main/java/com/loroclip/Authenticator.java
@@ -10,6 +10,8 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import com.loroclip.view.LoginActivity;
+
 import java.util.Date;
 
 /**
diff --git a/app/src/main/java/com/loroclip/LoroClipAPIClient.java b/app/src/main/java/com/loroclip/LoroClipAPIClient.java
index 56ccbda..9432b74 100644
--- a/app/src/main/java/com/loroclip/LoroClipAPIClient.java
+++ b/app/src/main/java/com/loroclip/LoroClipAPIClient.java
@@ -7,6 +7,7 @@
 import com.loroclip.model.BookmarkHistory;
 import com.loroclip.model.Record;
 import com.loroclip.model.SyncableModel;
+import com.loroclip.util.GmtDateTypeAdapter;
 
 import java.util.Date;
 import java.util.List;
diff --git a/app/src/main/java/com/loroclip/SavedBookmarkHistoryListDialog.java b/app/src/main/java/com/loroclip/SavedBookmarkHistoryListDialog.java
deleted file mode 100644
index 22d2c98..0000000
--- a/app/src/main/java/com/loroclip/SavedBookmarkHistoryListDialog.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.loroclip;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Message;
-import android.view.View;
-import android.widget.AdapterView;
-
-import com.loroclip.model.BookmarkHistory;
-import com.loroclip.model.Record;
-
-import java.util.ArrayList;
-
-/**
- * Created by minhyeok on 5/13/15.
- */
-public class SavedBookmarkHistoryListDialog extends Dialog {
-    private ArrayList<BookmarkHistory> bookmarkHistoryList;
-    private BookmarkListView bookmarkHistoryListView;
-    private Message response;
-
-    public SavedBookmarkHistoryListDialog(Context context, Record record, Message msg) {
-        super(context);
-
-        setContentView(R.layout.saved_bookmark_history_list_dialog);
-
-        setTitle("북마크 선택");
-
-        bookmarkHistoryListView = (BookmarkListView) findViewById(R.id.bookmark_dialog_listview);
-        SavedBookmarkHistoryListAdapter adapter = new SavedBookmarkHistoryListAdapter(record);
-        bookmarkHistoryListView.setAdapter(adapter);
-        bookmarkHistoryList = (ArrayList<BookmarkHistory>) adapter.getSavedBookmarkHistory();
-
-        response = msg;
-
-        bookmarkHistoryListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                response.arg1 = bookmarkHistoryList.get(i).getStartMiiliseconds();
-                response.sendToTarget();
-                dismiss();
-            }
-        });
-
-        bookmarkHistoryListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long l) {
-              final BookmarkHistory bookmarkHistory = bookmarkHistoryList.get(i);
-
-                new AlertDialog.Builder(getContext())
-                        .setTitle("Delete Bookmark")
-                        .setMessage(R.string.confirm_delete_loroclip)
-                        .setPositiveButton(
-                                R.string.delete_ok_button,
-                                new DialogInterface.OnClickListener() {
-                                  public void onClick(DialogInterface dialog,
-                                                      int whichButton) {
-                                      response.obj = bookmarkHistory;
-                                      response.sendToTarget();
-                                      dismiss();
-//                                    onDelete(bookmarkHistory);
-                                  }
-                                })
-                        .setNegativeButton(
-                                R.string.delete_cancel_button,
-                                new DialogInterface.OnClickListener() {
-                                  public void onClick(DialogInterface dialog,
-                                                      int whichButton) {
-                                  }
-                                })
-                        .setCancelable(true)
-                        .show();
-                return true;
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/loroclip/TokenManager.java b/app/src/main/java/com/loroclip/TokenManager.java
deleted file mode 100644
index db65032..0000000
--- a/app/src/main/java/com/loroclip/TokenManager.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.loroclip;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-
-/**
- * Created by angdev on 15. 5. 12..
- */
-public class TokenManager {
-    private static TokenManager sInstance;
-    private static final Object sInstanceLock = new Object();
-
-    private boolean mIsInitialized;
-    private Context mContext;
-    private AccountManager mAccountManager;
-    private Account mAccount;
-
-    public interface TokenManagerCallback {
-        void run(String s);
-    }
-
-    private TokenManager() {
-        mIsInitialized = false;
-    }
-
-    public static TokenManager getInstance() {
-        if (sInstance == null) {
-            synchronized (sInstanceLock) {
-                if (sInstance == null) {
-                    sInstance = new TokenManager();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public AccountManagerFuture<Bundle> initialize(final Activity activity, final Context context, final TokenManagerCallback callback) {
-        mContext = context;
-        mAccountManager = AccountManager.get(mContext);
-
-        Account[] accounts = mAccountManager.getAccountsByType(LoroClipAccount.ACCOUNT_TYPE);
-        if (accounts.length == 0) {
-            return mAccountManager.addAccount(LoroClipAccount.ACCOUNT_TYPE, null, null, null, activity,
-                    new AccountManagerCallback<Bundle>() {
-                        @Override
-                        public void run(AccountManagerFuture<Bundle> accountManagerFuture) {
-                            Account[] accounts = mAccountManager.getAccountsByType(LoroClipAccount.ACCOUNT_TYPE);
-                            mAccount = accounts[0];
-                            mIsInitialized = true;
-
-                            if (callback != null) {
-                                callback.run(null);
-                            }
-                        }
-                    }, null);
-        }
-
-        mAccount = accounts[0];
-        mIsInitialized = true;
-        callback.run(null);
-
-        return null;
-    }
-
-    public void getAccessToken(final Activity activity, final TokenManagerCallback callback) {
-        final AccountManagerCallback<Bundle> authTokenCallback = new AccountManagerCallback<Bundle>() {
-            @Override
-            public void run(AccountManagerFuture<Bundle> accountManagerFuture) {
-                try {
-                    Bundle bundle = accountManagerFuture.getResult();
-                    callback.run(bundle.getString(AccountManager.KEY_AUTHTOKEN));
-                } catch (Exception e) {
-                    callback.run(null);
-                }
-            }
-        };
-
-        if (!mIsInitialized) {
-            initialize(activity, activity.getApplicationContext(), new TokenManagerCallback() {
-                @Override
-                public void run(String s) {
-                    mAccountManager.getAuthToken(mAccount, LoroClipAccount.AUTHTOKEN_TYPE, null, activity, authTokenCallback, null);
-                }
-            });
-        } else {
-            mAccountManager.getAuthToken(mAccount, LoroClipAccount.AUTHTOKEN_TYPE, null, activity, authTokenCallback, null);
-        }
-    }
-}
diff --git a/app/src/main/java/com/loroclip/BookmarkListAdapter.java b/app/src/main/java/com/loroclip/adapter/BookmarkListAdapter.java
similarity index 98%
rename from app/src/main/java/com/loroclip/BookmarkListAdapter.java
rename to app/src/main/java/com/loroclip/adapter/BookmarkListAdapter.java
index 3bd3f01..5432b49 100644
--- a/app/src/main/java/com/loroclip/BookmarkListAdapter.java
+++ b/app/src/main/java/com/loroclip/adapter/BookmarkListAdapter.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.adapter;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -10,6 +10,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.loroclip.R;
 import com.loroclip.model.Bookmark;
 
 import java.util.List;
diff --git a/app/src/main/java/com/loroclip/RecordListAdapter.java b/app/src/main/java/com/loroclip/adapter/RecordListAdapter.java
similarity index 98%
rename from app/src/main/java/com/loroclip/RecordListAdapter.java
rename to app/src/main/java/com/loroclip/adapter/RecordListAdapter.java
index b9416b5..c216784 100644
--- a/app/src/main/java/com/loroclip/RecordListAdapter.java
+++ b/app/src/main/java/com/loroclip/adapter/RecordListAdapter.java
@@ -1,13 +1,13 @@
-package com.loroclip;
+package com.loroclip.adapter;
 
 import android.app.Activity;
-import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.loroclip.R;
 import com.loroclip.model.Record;
 
 import java.util.List;
diff --git a/app/src/main/java/com/loroclip/SavedBookmarkHistoryListAdapter.java b/app/src/main/java/com/loroclip/adapter/SavedBookmarkHistoryListAdapter.java
similarity index 97%
rename from app/src/main/java/com/loroclip/SavedBookmarkHistoryListAdapter.java
rename to app/src/main/java/com/loroclip/adapter/SavedBookmarkHistoryListAdapter.java
index 584aaa4..5b9d528 100644
--- a/app/src/main/java/com/loroclip/SavedBookmarkHistoryListAdapter.java
+++ b/app/src/main/java/com/loroclip/adapter/SavedBookmarkHistoryListAdapter.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,6 +8,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.loroclip.R;
 import com.loroclip.model.BookmarkHistory;
 import com.loroclip.model.Record;
 import com.loroclip.util.Util;
diff --git a/app/src/main/java/com/loroclip/decoder/DecodeFeed.java b/app/src/main/java/com/loroclip/decoder/DecodeFeed.java
deleted file mode 100644
index ffa0c26..0000000
--- a/app/src/main/java/com/loroclip/decoder/DecodeFeed.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.loroclip.decoder;
-
-/**
- * A feed interface which raw PCM data will be written to and encoded vorbis data will be read from
- * User: vincent
- * Date: 3/27/13
- * Time: 2:11 PM
- */
-public interface DecodeFeed {
-    /**
-     * Everything was a success
-     */
-    public static final int SUCCESS = 0;
-
-    /**
-     * The bitstream is not ogg
-     */
-    public static final int INVALID_OGG_BITSTREAM = -21;
-
-    /**
-     * Failed to read first page
-     */
-    public static final int ERROR_READING_FIRST_PAGE = -22;
-
-    /**
-     * Failed reading the initial header packet
-     */
-    public static final int ERROR_READING_INITIAL_HEADER_PACKET = -23;
-
-    /**
-     * The data is not a vorbis header
-     */
-    public static final int NOT_VORBIS_HEADER = -24;
-
-    /**
-     * The secondary header is corrupt
-     */
-    public static final int CORRUPT_SECONDARY_HEADER = -25;
-
-    /**
-     * Reached a premature end of file
-     */
-    public static final int PREMATURE_END_OF_FILE = -26;
-
-    /**
-     * Triggered from the native {@link VorbisDecoder} that is requesting to read the next bit of vorbis data
-     *
-     * @param buffer        the buffer to write to
-     * @param amountToWrite the amount of vorbis data to write
-     * @return the amount actually written
-     */
-    public int readVorbisData(byte[] buffer, int amountToWrite);
-
-    /**
-     * Triggered from the native {@link VorbisDecoder} that is requesting to write the next bit of raw PCM data
-     *
-     * @param pcmData      the raw pcm data
-     * @param amountToRead the amount available to read in the buffer
-     */
-    public void writePCMData(short[] pcmData, int amountToRead);
-
-    /**
-     * To be called when decoding has completed
-     */
-    public void stop();
-
-    /**
-     * Puts the decode feed in the reading header state
-     */
-    public void startReadingHeader();
-
-    /**
-     * To be called when decoding has started
-     *
-     * @param decodeStreamInfo the stream information of what's about to be played
-     */
-    public void start(DecodeStreamInfo decodeStreamInfo);
-}
diff --git a/app/src/main/java/com/loroclip/decoder/DecodeStreamInfo.java b/app/src/main/java/com/loroclip/decoder/DecodeStreamInfo.java
deleted file mode 100644
index a0998ec..0000000
--- a/app/src/main/java/com/loroclip/decoder/DecodeStreamInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.loroclip.decoder;
-
-/**
- * User: vincent
- * Date: 3/29/13
- * Time: 8:17 PM
- */
-public class DecodeStreamInfo {
-    private long sampleRate;
-
-    private long channels;
-
-    private String vendor;
-
-    public DecodeStreamInfo(long sampleRate, long channels, String vendor) {
-        this.sampleRate = sampleRate;
-        this.channels = channels;
-        this.vendor = vendor;
-    }
-
-    public long getSampleRate() {
-        return sampleRate;
-    }
-
-    public void setSampleRate(long sampleRate) {
-        this.sampleRate = sampleRate;
-    }
-
-    public long getChannels() {
-        return channels;
-    }
-
-    public void setChannels(long channels) {
-        this.channels = channels;
-    }
-
-    public String getVendor() {
-        return vendor;
-    }
-
-    public void setVendor(String vendor) {
-        this.vendor = vendor;
-    }
-}
diff --git a/app/src/main/java/com/loroclip/decoder/VorbisDecoder.java b/app/src/main/java/com/loroclip/decoder/VorbisDecoder.java
deleted file mode 100644
index a53af6a..0000000
--- a/app/src/main/java/com/loroclip/decoder/VorbisDecoder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.loroclip.decoder;
-
-/**
- * The native vorbis decoder to be used in conjunction with JNI
- * User: vincent
- * Date: 3/27/13
- * Time: 9:07 AM
- */
-public class VorbisDecoder {
-
-    /**
-     * Load our vorbis-jni library and other dependent libraries
-     */
-    static {
-        System.loadLibrary("ogg");
-        System.loadLibrary("vorbis");
-        System.loadLibrary("vorbis-jni");
-    }
-
-    /**
-     * Start decoding the data by way of a jni call
-     *
-     * @param decodeFeed the custom decode feed
-     * @return the result code
-     */
-    public static native int startDecoding(DecodeFeed decodeFeed);
-}
diff --git a/app/src/main/java/com/loroclip/record/RecordListAdapter.java b/app/src/main/java/com/loroclip/record/RecordListAdapter.java
deleted file mode 100644
index 9e1f818..0000000
--- a/app/src/main/java/com/loroclip/record/RecordListAdapter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.loroclip.record;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.loroclip.model.Record;
-
-import java.util.List;
-
-/**
- * Created by minhyeok on 5/19/15.
- */
-public class RecordListAdapter extends BaseAdapter{
-    private List<Record> mRecords;
-
-    public RecordListAdapter(List<Record> records) {
-        this.mRecords = records;
-    }
-
-    @Override
-    public int getCount() {
-        return mRecords.size();
-    }
-
-    @Override
-    public String getItem(int i) {
-        return mRecords.get(i).getTitle();
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return mRecords.get(i).getId();
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        Context context = viewGroup.getContext();
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        view = inflater.inflate(android.R.layout.simple_list_item_1, viewGroup, false);
-
-        TextView titleTextView = (TextView) view.findViewById(android.R.id.text1);
-        titleTextView.setText(getItem(i));
-
-        return view;
-
-    }
-
-    @Override
-    public void notifyDataSetChanged() {
-        super.notifyDataSetChanged();
-    }
-}
diff --git a/app/src/main/java/com/loroclip/GmtDateTypeAdapter.java b/app/src/main/java/com/loroclip/util/GmtDateTypeAdapter.java
similarity index 98%
rename from app/src/main/java/com/loroclip/GmtDateTypeAdapter.java
rename to app/src/main/java/com/loroclip/util/GmtDateTypeAdapter.java
index 99a4d4f..0e29fef 100644
--- a/app/src/main/java/com/loroclip/GmtDateTypeAdapter.java
+++ b/app/src/main/java/com/loroclip/util/GmtDateTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.util;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/app/src/main/java/com/loroclip/SongMetadataReader.java b/app/src/main/java/com/loroclip/util/SongMetadataReader.java
similarity index 97%
rename from app/src/main/java/com/loroclip/SongMetadataReader.java
rename to app/src/main/java/com/loroclip/util/SongMetadataReader.java
index 09bc64e..141d121 100644
--- a/app/src/main/java/com/loroclip/SongMetadataReader.java
+++ b/app/src/main/java/com/loroclip/util/SongMetadataReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.loroclip;
-
-import java.util.HashMap;
+package com.loroclip.util;
 
 import android.app.Activity;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
 
+import java.util.HashMap;
+
 public class SongMetadataReader {
     public Uri GENRES_URI = MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI;
     public Activity mActivity = null;
@@ -33,7 +33,7 @@ public class SongMetadataReader {
     public String mGenre = "";
     public int mYear = -1;
 
-    SongMetadataReader(Activity activity, String filename) {
+    public SongMetadataReader(Activity activity, String filename) {
         mActivity = activity;
         mFilename = filename;
         mTitle = getBasename(filename);
diff --git a/app/src/main/java/com/loroclip/record/encoder/EncodeFeed.java b/app/src/main/java/com/loroclip/util/encoder/EncodeFeed.java
similarity index 96%
rename from app/src/main/java/com/loroclip/record/encoder/EncodeFeed.java
rename to app/src/main/java/com/loroclip/util/encoder/EncodeFeed.java
index 03ff891..df54adc 100644
--- a/app/src/main/java/com/loroclip/record/encoder/EncodeFeed.java
+++ b/app/src/main/java/com/loroclip/util/encoder/EncodeFeed.java
@@ -1,4 +1,4 @@
-package com.loroclip.record.encoder; /**
+package com.loroclip.util.encoder; /**
  * Created by stompesi on 15. 5. 16..
  */
 
diff --git a/app/src/main/java/com/loroclip/record/encoder/VorbisEncoder.java b/app/src/main/java/com/loroclip/util/encoder/VorbisEncoder.java
similarity index 97%
rename from app/src/main/java/com/loroclip/record/encoder/VorbisEncoder.java
rename to app/src/main/java/com/loroclip/util/encoder/VorbisEncoder.java
index 456a1ea..df9a6d4 100644
--- a/app/src/main/java/com/loroclip/record/encoder/VorbisEncoder.java
+++ b/app/src/main/java/com/loroclip/util/encoder/VorbisEncoder.java
@@ -1,4 +1,4 @@
-package com.loroclip.record.encoder;
+package com.loroclip.util.encoder;
 /**
  * Created by stompesi on 15. 5. 16..
  */
diff --git a/app/src/main/java/com/loroclip/record/recorder/VorbisRecorder.java b/app/src/main/java/com/loroclip/util/recorder/VorbisRecorder.java
similarity index 97%
rename from app/src/main/java/com/loroclip/record/recorder/VorbisRecorder.java
rename to app/src/main/java/com/loroclip/util/recorder/VorbisRecorder.java
index 4c0e08d..87848a5 100644
--- a/app/src/main/java/com/loroclip/record/recorder/VorbisRecorder.java
+++ b/app/src/main/java/com/loroclip/util/recorder/VorbisRecorder.java
@@ -1,4 +1,4 @@
-package com.loroclip.record.recorder;
+package com.loroclip.util.recorder;
 
 /**
  * Created by stompesi on 15. 5. 16..
@@ -10,9 +10,9 @@
 import android.os.Process;
 import android.util.Log;
 
-import com.loroclip.record.View.RecordWaveformView;
-import com.loroclip.record.encoder.EncodeFeed;
-import com.loroclip.record.encoder.VorbisEncoder;
+import com.loroclip.view.RecordWaveformView;
+import com.loroclip.util.encoder.EncodeFeed;
+import com.loroclip.util.encoder.VorbisEncoder;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/app/src/main/java/com/loroclip/soundfile/MP4Header.java b/app/src/main/java/com/loroclip/util/soundfile/MP4Header.java
similarity index 99%
rename from app/src/main/java/com/loroclip/soundfile/MP4Header.java
rename to app/src/main/java/com/loroclip/util/soundfile/MP4Header.java
index 580b4f9..35313a4 100644
--- a/app/src/main/java/com/loroclip/soundfile/MP4Header.java
+++ b/app/src/main/java/com/loroclip/util/soundfile/MP4Header.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.loroclip.soundfile;
+package com.loroclip.util.soundfile;
 
 class Atom {  // note: latest versions of spec simply call it 'box' instead of 'atom'.
     private int mSize;  // includes atom header (8 bytes)
diff --git a/app/src/main/java/com/loroclip/soundfile/SoundFile.java b/app/src/main/java/com/loroclip/util/soundfile/SoundFile.java
similarity index 99%
rename from app/src/main/java/com/loroclip/soundfile/SoundFile.java
rename to app/src/main/java/com/loroclip/util/soundfile/SoundFile.java
index 388ca80..b2af2d8 100644
--- a/app/src/main/java/com/loroclip/soundfile/SoundFile.java
+++ b/app/src/main/java/com/loroclip/util/soundfile/SoundFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.loroclip.soundfile;
+package com.loroclip.util.soundfile;
 
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
diff --git a/app/src/main/java/com/loroclip/BookmarkListView.java b/app/src/main/java/com/loroclip/view/BookmarkListView.java
similarity index 91%
rename from app/src/main/java/com/loroclip/BookmarkListView.java
rename to app/src/main/java/com/loroclip/view/BookmarkListView.java
index 31b5ca2..fdd2e30 100644
--- a/app/src/main/java/com/loroclip/BookmarkListView.java
+++ b/app/src/main/java/com/loroclip/view/BookmarkListView.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/loroclip/LoginActivity.java b/app/src/main/java/com/loroclip/view/LoginActivity.java
similarity index 97%
rename from app/src/main/java/com/loroclip/LoginActivity.java
rename to app/src/main/java/com/loroclip/view/LoginActivity.java
index b03f0ce..88b791c 100644
--- a/app/src/main/java/com/loroclip/LoginActivity.java
+++ b/app/src/main/java/com/loroclip/view/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
@@ -19,6 +19,10 @@
 import com.facebook.FacebookSdk;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
+import com.loroclip.EventPublisher;
+import com.loroclip.LoroClipAccount;
+import com.loroclip.LoroClipAuthClient;
+import com.loroclip.R;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/loroclip/LoroClipEditActivity.java b/app/src/main/java/com/loroclip/view/LoroClipEditActivity.java
similarity index 99%
rename from app/src/main/java/com/loroclip/LoroClipEditActivity.java
rename to app/src/main/java/com/loroclip/view/LoroClipEditActivity.java
index 5510793..8e1426c 100644
--- a/app/src/main/java/com/loroclip/LoroClipEditActivity.java
+++ b/app/src/main/java/com/loroclip/view/LoroClipEditActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.loroclip;
+package com.loroclip.view;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -40,12 +40,17 @@
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.loroclip.EventPublisher;
+import com.loroclip.LoroClipPlayer;
+import com.loroclip.R;
 import com.loroclip.adapter.BookmarkHistoryAdapter;
+import com.loroclip.adapter.BookmarkListAdapter;
 import com.loroclip.model.Bookmark;
 import com.loroclip.model.BookmarkHistory;
 import com.loroclip.model.Record;
-import com.loroclip.soundfile.SoundFile;
+import com.loroclip.util.SongMetadataReader;
 import com.loroclip.util.Util;
+import com.loroclip.util.soundfile.SoundFile;
 import com.ogaclejapan.smarttablayout.SmartTabLayout;
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItem;
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter;
diff --git a/app/src/main/java/com/loroclip/MainActivity.java b/app/src/main/java/com/loroclip/view/MainActivity.java
similarity index 99%
rename from app/src/main/java/com/loroclip/MainActivity.java
rename to app/src/main/java/com/loroclip/view/MainActivity.java
index b424a40..d6acbe4 100644
--- a/app/src/main/java/com/loroclip/MainActivity.java
+++ b/app/src/main/java/com/loroclip/view/MainActivity.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 import android.accounts.Account;
 import android.app.ProgressDialog;
@@ -31,8 +31,10 @@
 import com.koushikdutta.async.future.FutureCallback;
 import com.koushikdutta.ion.Ion;
 import com.koushikdutta.ion.ProgressCallback;
+import com.loroclip.LoroClipAccount;
+import com.loroclip.R;
+import com.loroclip.adapter.RecordListAdapter;
 import com.loroclip.model.Record;
-import com.loroclip.record.RecordActivity;
 import com.melnykov.fab.FloatingActionButton;
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
diff --git a/app/src/main/java/com/loroclip/PlayActivity.java b/app/src/main/java/com/loroclip/view/PlayActivity.java
similarity index 96%
rename from app/src/main/java/com/loroclip/PlayActivity.java
rename to app/src/main/java/com/loroclip/view/PlayActivity.java
index 496f599..948339a 100644
--- a/app/src/main/java/com/loroclip/PlayActivity.java
+++ b/app/src/main/java/com/loroclip/view/PlayActivity.java
@@ -1,10 +1,11 @@
-package com.loroclip;
+package com.loroclip.view;
 
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.loroclip.R;
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter;
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems;
 
diff --git a/app/src/main/java/com/loroclip/PlayActivityFragment.java b/app/src/main/java/com/loroclip/view/PlayActivityFragment.java
similarity index 91%
rename from app/src/main/java/com/loroclip/PlayActivityFragment.java
rename to app/src/main/java/com/loroclip/view/PlayActivityFragment.java
index f8a326f..7b54111 100644
--- a/app/src/main/java/com/loroclip/PlayActivityFragment.java
+++ b/app/src/main/java/com/loroclip/view/PlayActivityFragment.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 import android.support.v4.app.Fragment;
 import android.os.Bundle;
@@ -6,6 +6,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.loroclip.R;
+
 
 /**
  * A placeholder fragment containing a simple view.
diff --git a/app/src/main/java/com/loroclip/PlayerBookmarkFragment.java b/app/src/main/java/com/loroclip/view/PlayerBookmarkFragment.java
similarity index 95%
rename from app/src/main/java/com/loroclip/PlayerBookmarkFragment.java
rename to app/src/main/java/com/loroclip/view/PlayerBookmarkFragment.java
index 9bd6d36..8ea1152 100644
--- a/app/src/main/java/com/loroclip/PlayerBookmarkFragment.java
+++ b/app/src/main/java/com/loroclip/view/PlayerBookmarkFragment.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 
 import android.app.Activity;
@@ -11,6 +11,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.loroclip.R;
+import com.loroclip.adapter.BookmarkListAdapter;
 import com.loroclip.model.Bookmark;
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
diff --git a/app/src/main/java/com/loroclip/PlayerRecordHistoryFragment.java b/app/src/main/java/com/loroclip/view/PlayerRecordHistoryFragment.java
similarity index 98%
rename from app/src/main/java/com/loroclip/PlayerRecordHistoryFragment.java
rename to app/src/main/java/com/loroclip/view/PlayerRecordHistoryFragment.java
index cb6e2c7..9327744 100644
--- a/app/src/main/java/com/loroclip/PlayerRecordHistoryFragment.java
+++ b/app/src/main/java/com/loroclip/view/PlayerRecordHistoryFragment.java
@@ -1,4 +1,4 @@
-package com.loroclip;
+package com.loroclip.view;
 
 
 import android.app.Activity;
@@ -11,6 +11,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.loroclip.R;
 import com.loroclip.adapter.BookmarkHistoryAdapter;
 import com.loroclip.model.BookmarkHistory;
 import com.loroclip.model.Record;
diff --git a/app/src/main/java/com/loroclip/record/RecordActivity.java b/app/src/main/java/com/loroclip/view/RecordActivity.java
similarity index 98%
rename from app/src/main/java/com/loroclip/record/RecordActivity.java
rename to app/src/main/java/com/loroclip/view/RecordActivity.java
index e44b0a1..fe181ec 100644
--- a/app/src/main/java/com/loroclip/record/RecordActivity.java
+++ b/app/src/main/java/com/loroclip/view/RecordActivity.java
@@ -1,5 +1,5 @@
 
-package com.loroclip.record;
+package com.loroclip.view;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -28,15 +28,14 @@
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.loroclip.BookmarkListAdapter;
+import com.loroclip.adapter.BookmarkListAdapter;
 import com.loroclip.EventPublisher;
 import com.loroclip.R;
 import com.loroclip.model.Bookmark;
 import com.loroclip.model.BookmarkHistory;
 import com.loroclip.model.FrameGains;
 import com.loroclip.model.Record;
-import com.loroclip.record.View.RecordWaveformView;
-import com.loroclip.record.recorder.VorbisRecorder;
+import com.loroclip.util.recorder.VorbisRecorder;
 import com.loroclip.util.Util;
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
diff --git a/app/src/main/java/com/loroclip/record/View/RecordWaveformView.java b/app/src/main/java/com/loroclip/view/RecordWaveformView.java
similarity index 99%
rename from app/src/main/java/com/loroclip/record/View/RecordWaveformView.java
rename to app/src/main/java/com/loroclip/view/RecordWaveformView.java
index dc9e752..e51604d 100644
--- a/app/src/main/java/com/loroclip/record/View/RecordWaveformView.java
+++ b/app/src/main/java/com/loroclip/view/RecordWaveformView.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.loroclip.record.View;
+package com.loroclip.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/loroclip/WaveformView.java b/app/src/main/java/com/loroclip/view/WaveformView.java
similarity index 99%
rename from app/src/main/java/com/loroclip/WaveformView.java
rename to app/src/main/java/com/loroclip/view/WaveformView.java
index 19609f0..0c259c0 100644
--- a/app/src/main/java/com/loroclip/WaveformView.java
+++ b/app/src/main/java/com/loroclip/view/WaveformView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.loroclip;
+package com.loroclip.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -27,8 +27,9 @@
 import android.view.ScaleGestureDetector;
 import android.view.View;
 
+import com.loroclip.R;
 import com.loroclip.model.BookmarkHistory;
-import com.loroclip.soundfile.SoundFile;
+import com.loroclip.util.soundfile.SoundFile;
 import com.loroclip.util.Util;
 
 import java.util.ArrayList;
diff --git a/app/src/main/jni/libvorbis-jni/Android.mk b/app/src/main/jni/libvorbis-jni/Android.mk
index 6f20893..7d94574 100644
--- a/app/src/main/jni/libvorbis-jni/Android.mk
+++ b/app/src/main/jni/libvorbis-jni/Android.mk
@@ -13,7 +13,6 @@ LOCAL_SHARED_LIBRARIES := libogg libvorbis
 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
 
 LOCAL_SRC_FILES := \
-	com_loroclip_record_encoder_VorbisEncoder.c \
-	com_loroclip_decoder_VorbisDecoder.c
+	com_loroclip_util_encoder_VorbisEncoder.c
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.c b/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.c
deleted file mode 100644
index 24f667c..0000000
--- a/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* Takes a vorbis bitstream from java callbacks from JNI and writes raw stereo PCM to
-the jni callbacks. Decodes simple and chained OggVorbis files from beginning
-to end. */
-
-#include "com_loroclip_decoder_VorbisDecoder.h"
-
-/*Define message codes*/
-#define INVALID_OGG_BITSTREAM -21
-#define ERROR_READING_FIRST_PAGE -22
-#define ERROR_READING_INITIAL_HEADER_PACKET -23
-#define NOT_VORBIS_HEADER -24
-#define CORRUPT_SECONDARY_HEADER -25
-#define PREMATURE_END_OF_FILE -26
-#define SUCCESS 0
-
-#define BUFFER_LENGTH 4096
-
-extern void _VDBG_dump(void);
-
-//Stops the vorbis data feed
-void stopDecodeFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* stopMethodId) {
-    (*env)->CallVoidMethod(env, (*vorbisDataFeed), (*stopMethodId));
-}
-
-//Reads raw vorbis data from the jni callback
-int readVorbisDataFromVorbisDataFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* readVorbisDataMethodId, char* buffer, jbyteArray* jByteArrayReadBuffer) {
-    //Call the read method
-    int readByteCount = (*env)->CallIntMethod(env, (*vorbisDataFeed), (*readVorbisDataMethodId), (*jByteArrayReadBuffer), BUFFER_LENGTH);
-    
-    //Don't bother copying, just return 0
-    if(readByteCount == 0) {
-        return 0;
-    }
-
-    //Gets the bytes from the java array and copies them to the vorbis buffer
-    jbyte* readBytes = (*env)->GetByteArrayElements(env, (*jByteArrayReadBuffer), NULL);
-    memcpy(buffer, readBytes, readByteCount);
-    
-    //Clean up memory and return how much data was read
-    (*env)->ReleaseByteArrayElements(env, (*jByteArrayReadBuffer), readBytes, JNI_ABORT);
-
-    //Return the amount actually read
-    return readByteCount;
-}
-
-//Writes the pcm data to the Java layer
-void writePCMDataFromVorbisDataFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* writePCMDataMethodId, ogg_int16_t* buffer, int bytes, jshortArray* jShortArrayWriteBuffer) {
-    
-    //No data to read, just exit
-    if(bytes == 0) {
-        return;
-    }
-
-    //Copy the contents of what we're writing to the java short array
-    (*env)->SetShortArrayRegion(env, (*jShortArrayWriteBuffer), 0, bytes, (jshort *)buffer);
-    
-    //Call the write pcm data method
-    (*env)->CallVoidMethod(env, (*vorbisDataFeed), (*writePCMDataMethodId), (*jShortArrayWriteBuffer), bytes);
-}
-
-//Starts the decode feed with the necessary information about sample rates, channels, etc about the stream
-void start(JNIEnv *env, jobject *vorbisDataFeed, jmethodID* startMethodId, long sampleRate, long channels, char* vendor) {
-    __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Notifying decode feed");
-
-    //Creates a java string for the vendor
-    jstring vendorString = (*env)->NewStringUTF(env, vendor);
-
-    //Get decode stream info class and constructor
-    jclass decodeStreamInfoClass = (*env)->FindClass(env, "com/loroclip/decoder/DecodeStreamInfo");
-    jmethodID constructor = (*env)->GetMethodID(env, decodeStreamInfoClass, "<init>", "(JJLjava/lang/String;)V");
-
-    //Create the decode stream info object
-    jobject decodeStreamInfo = (*env)->NewObject(env, decodeStreamInfoClass, constructor, (jlong)sampleRate, (jlong)channels, vendorString);
-
-    //Call decode feed start
-    (*env)->CallVoidMethod(env, (*vorbisDataFeed), (*startMethodId), decodeStreamInfo);
-
-    //Cleanup decode feed object
-    (*env)->DeleteLocalRef(env, decodeStreamInfo);
-
-    //Cleanup java vendor string
-    (*env)->DeleteLocalRef(env, vendorString);
-}
-
-//Starts reading the header information
-void startReadingHeader(JNIEnv *env, jobject *vorbisDataFeed, jmethodID* startReadingHeaderMethodId) {
-    __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Notifying decode feed to start reading the header");
-
-    //Call header start reading method
-    (*env)->CallVoidMethod(env, (*vorbisDataFeed), (*startReadingHeaderMethodId));
-}
-
-JNIEXPORT int JNICALL Java_com_loroclip_decoder_VorbisDecoder_startDecoding
-(JNIEnv *env, jclass cls, jobject vorbisDataFeed) {
-
-    //Create a new java byte array to pass to the vorbis data feed method
-    jbyteArray jByteArrayReadBuffer = (*env)->NewByteArray(env, BUFFER_LENGTH);
-
-    //Create our write buffer
-    jshortArray jShortArrayWriteBuffer = (*env)->NewShortArray(env, BUFFER_LENGTH*2);
-
-    //Find our java classes we'll be calling
-    jclass vorbisDataFeedClass = (*env)->FindClass(env, "com/loroclip/decoder/DecodeFeed");
-
-    //Find our java method id's we'll be calling
-    jmethodID readVorbisDataMethodId = (*env)->GetMethodID(env, vorbisDataFeedClass, "readVorbisData", "([BI)I");
-    jmethodID writePCMDataMethodId = (*env)->GetMethodID(env, vorbisDataFeedClass, "writePCMData", "([SI)V");
-    jmethodID startMethodId = (*env)->GetMethodID(env, vorbisDataFeedClass, "start", "(Lcom/loroclip/decoder/DecodeStreamInfo;)V");
-    jmethodID startReadingHeaderMethodId = (*env)->GetMethodID(env, vorbisDataFeedClass, "startReadingHeader", "()V");
-    jmethodID stopMethodId = (*env)->GetMethodID(env, vorbisDataFeedClass, "stop", "()V");
-
-    ogg_int16_t convbuffer[BUFFER_LENGTH]; /* take 8k out of the data segment, not the stack */
-    int convsize=BUFFER_LENGTH;
-    
-    ogg_sync_state   oy; /* sync and verify incoming physical bitstream */
-    ogg_stream_state os; /* take physical pages, weld into a logical stream of packets */
-    ogg_page         og; /* one Ogg bitstream page. Vorbis packets are inside */
-    ogg_packet       op; /* one raw packet of data for decode */
-    
-    vorbis_info      vi; /* struct that stores all the static vorbis bitstream settings */
-    vorbis_comment   vc; /* struct that stores all the bitstream user comments */
-    vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-    vorbis_block     vb; /* local working space for packet->PCM decode */
-    
-    char *buffer;
-    int  bytes;
-    
-    /********** Decode setup ************/
-
-    //Notify the decode feed we are starting to initialize
-    startReadingHeader(env, &vorbisDataFeed, &startReadingHeaderMethodId);
-    
-    ogg_sync_init(&oy); /* Now we can read pages */
-    
-    while(1){
-        /* we repeat if the bitstream is chained */
-        int eos=0;
-        int i;
-        
-        /* grab some data at the head of the stream. We want the first page
-        (which is guaranteed to be small and only contain the Vorbis
-        stream initial header) We need the first page to get the stream
-        serialno. */
-        
-        /* submit a 4k block to libvorbis' Ogg layer */
-        __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Submitting 4k block to libvorbis' Ogg layer");
-        buffer=ogg_sync_buffer(&oy,BUFFER_LENGTH);
-        bytes=readVorbisDataFromVorbisDataFeed(env, &vorbisDataFeed, &readVorbisDataMethodId, buffer, &jByteArrayReadBuffer);
-        ogg_sync_wrote(&oy,bytes);
-        
-        /* Get the first page. */
-        __android_log_print(ANDROID_LOG_DEBUG, "VorbisDecoder", "Getting the first page, read (%d) bytes", bytes);
-        if(ogg_sync_pageout(&oy,&og)!=1){
-            /* have we simply run out of data?  If so, we're done. */
-            if(bytes<BUFFER_LENGTH)break;
-            
-            /* error case.  Must not be Vorbis data */
-            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-            return INVALID_OGG_BITSTREAM;
-        }
-
-        __android_log_write(ANDROID_LOG_INFO, "VorbisDecoder", "Successfully fetched the first page");
-
-        /* Get the serial number and set up the rest of decode. */
-        /* serialno first; use it to set up a logical stream */
-        ogg_stream_init(&os,ogg_page_serialno(&og));
-
-        /* extract the initial header from the first page and verify that the
-        Ogg bitstream is in fact Vorbis data */
-
-        /* I handle the initial header first instead of just having the code
-        read all three Vorbis headers at once because reading the initial
-        header is an easy way to identify a Vorbis bitstream and it's
-        useful to see that functionality seperated out. */
-
-        vorbis_info_init(&vi);
-        vorbis_comment_init(&vc);
-        if(ogg_stream_pagein(&os,&og)<0){
-            /* error; stream version mismatch perhaps */
-            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-            return ERROR_READING_FIRST_PAGE;
-        }
-
-
-        if(ogg_stream_packetout(&os,&op)!=1){
-            /* no page? must not be vorbis */
-            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-            return ERROR_READING_INITIAL_HEADER_PACKET;
-        }
-
-
-        if(vorbis_synthesis_headerin(&vi,&vc,&op)<0){
-            /* error case; not a vorbis header */
-            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-            return NOT_VORBIS_HEADER;
-        }
-
-
-        /* At this point, we're sure we're Vorbis. We've set up the logical
-        (Ogg) bitstream decoder. Get the comment and codebook headers and
-        set up the Vorbis decoder */
-
-        /* The next two packets in order are the comment and codebook headers.
-        They're likely large and may span multiple pages. Thus we read
-        and submit data until we get our two packets, watching that no
-        pages are missing. If a page is missing, error out; losing a
-        header page is the only place where missing data is fatal. */
-
-        i=0;
-        while(i<2){
-            while(i<2){
-                int result=ogg_sync_pageout(&oy,&og);
-                if(result==0)break; /* Need more data */
-                /* Don't complain about missing or corrupt data yet. We'll
-                catch it at the packet output phase */
-                if(result==1){
-                    ogg_stream_pagein(&os,&og); /* we can ignore any errors here
-                    as they'll also become apparent
-                    at packetout */
-                    while(i<2){
-                        result=ogg_stream_packetout(&os,&op);
-                        if(result==0)break;
-                        if(result<0){
-                            /* Uh oh; data at some point was corrupted or missing!
-                            We can't tolerate that in a header.  Die. */
-                            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-                            return CORRUPT_SECONDARY_HEADER;
-                        }
-                        result=vorbis_synthesis_headerin(&vi,&vc,&op);
-                        if(result<0){
-                            stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-                            return CORRUPT_SECONDARY_HEADER;
-                        }
-                        i++;
-                    }
-                }
-            }
-            /* no harm in not checking before adding more */
-            buffer=ogg_sync_buffer(&oy,BUFFER_LENGTH);
-            bytes=readVorbisDataFromVorbisDataFeed(env, &vorbisDataFeed, &readVorbisDataMethodId, buffer, &jByteArrayReadBuffer);
-            if(bytes==0 && i<2){
-                stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-                return PREMATURE_END_OF_FILE;
-            }
-            ogg_sync_wrote(&oy,bytes);
-        }
-
-
-        /* Throw the comments plus a few lines about the bitstream we're
-        decoding */
-        {
-            char **ptr=vc.user_comments;
-            while(*ptr){
-                ++ptr;
-            }
-
-            __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Bitstream is %d channel",vi.channels);
-            __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Bitstream %d Hz",vi.rate);
-            __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Encoded by: %s\n\n",vc.vendor);
-
-            start(env, &vorbisDataFeed, &startMethodId, vi.rate, vi.channels, vc.vendor);
-        }
-
-        convsize=BUFFER_LENGTH/vi.channels;
-
-        /* OK, got and parsed all three headers. Initialize the Vorbis
-        packet->PCM decoder. */
-        if(vorbis_synthesis_init(&vd,&vi)==0){
-            /* central decode state */
-            vorbis_block_init(&vd,&vb);          /* local state for most of the decode
-            so multiple block decodes can
-            proceed in parallel. We could init
-            multiple vorbis_block structures
-            for vd here */
-
-            /* The rest is just a straight decode loop until end of stream */
-            while(!eos){
-                while(!eos){
-                    int result=ogg_sync_pageout(&oy,&og);
-                    if(result==0)break; /* need more data */
-                    if(result<0){
-                        /* missing or corrupt data at this page position */
-                        __android_log_write(ANDROID_LOG_WARN, "VorbisDecoder", "Corrupt or missing data in bitstream; continuing...");
-                    }
-                    else{
-                        ogg_stream_pagein(&os,&og); /* can safely ignore errors at
-                        this point */
-                        while(1){
-                            result=ogg_stream_packetout(&os,&op);
-
-                            if(result==0)break; /* need more data */
-                            if(result<0){
-                                /* missing or corrupt data at this page position */
-                                /* no reason to complain; already complained above */
-                            }
-                            else{
-
-                                /* we have a packet.  Decode it */
-                                float **pcm;
-                                int samples;
-
-                                if(vorbis_synthesis(&vb,&op)==0) /* test for success! */
-                                vorbis_synthesis_blockin(&vd,&vb);
-                                /*
-
-                                **pcm is a multichannel float vector.  In stereo, for
-                                example, pcm[0] is left, and pcm[1] is right.  samples is
-                                the size of each channel.  Convert the float values
-                                (-1.<=range<=1.) to whatever PCM format and write it out */
-
-                                while((samples=vorbis_synthesis_pcmout(&vd,&pcm))>0){
-                                    int j;
-                                    int clipflag=0;
-                                    int bout=(samples<convsize?samples:convsize);
-
-                                    /* convert floats to 16 bit signed ints (host order) and
-                                    interleave */
-                                    for(i=0;i<vi.channels;i++){
-                                        ogg_int16_t *ptr=convbuffer+i;
-                                        float  *mono=pcm[i];
-                                        for(j=0;j<bout;j++){
-
-                                            #if 1
-                                            int val=floor(mono[j]*32767.f+.5f);
-                                            #else /* optional dither */
-                                            int val=mono[j]*32767.f+drand48()-0.5f;
-                                            #endif
-                                            /* might as well guard against clipping */
-                                            if(val>32767){
-                                                val=32767;
-                                                clipflag=1;
-                                            }
-
-                                            if(val<-32768){
-                                                val=-32768;
-                                                clipflag=1;
-                                            }
-
-                                            *ptr=val;
-                                            ptr+=vi.channels;
-                                        }
-                                    }
-
-                                    if(clipflag) {
-                                        __android_log_print(ANDROID_LOG_INFO, "VorbisDecoder", "Clipping in frame %ld\n",(long)(vd.sequence));
-                                    }
-
-                                    writePCMDataFromVorbisDataFeed(env, &vorbisDataFeed, &writePCMDataMethodId, &convbuffer[0], bout*vi.channels, &jShortArrayWriteBuffer);
-
-                                    vorbis_synthesis_read(&vd,bout); /* tell libvorbis how many samples we actually consumed */
-                                }
-                            }
-                        }
-                        if(ogg_page_eos(&og))eos=1;
-                    }
-                }
-
-                if(!eos){
-                    buffer=ogg_sync_buffer(&oy,BUFFER_LENGTH);
-                    bytes=readVorbisDataFromVorbisDataFeed(env, &vorbisDataFeed, &readVorbisDataMethodId, buffer, &jByteArrayReadBuffer);
-                    ogg_sync_wrote(&oy,bytes);
-                    if(bytes==0) {
-                        eos=1;
-                    }
-                }
-            }
-
-            /* ogg_page and ogg_packet structs always point to storage in
-            libvorbis.  They're never freed or manipulated directly */
-            vorbis_block_clear(&vb);
-            vorbis_dsp_clear(&vd);
-
-        }
-        else{
-            __android_log_print(ANDROID_LOG_WARN, "VorbisDecoder", "Error: Corrupt header during playback initialization.");
-        }
-
-        /* clean up this logical bitstream; before exit we see if we're
-        followed by another [chained] */
-
-        ogg_stream_clear(&os);
-        vorbis_comment_clear(&vc);
-        vorbis_info_clear(&vi);  /* must be called last */
-    }
-
-    /* OK, clean up the framer */
-    ogg_sync_clear(&oy);
-
-
-
-    stopDecodeFeed(env, &vorbisDataFeed, &stopMethodId);
-
-    //Clean up our buffers
-    (*env)->DeleteLocalRef(env, jByteArrayReadBuffer);
-    (*env)->DeleteLocalRef(env, jShortArrayWriteBuffer);
-
-    return SUCCESS;
-}
\ No newline at end of file
diff --git a/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.h b/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.h
deleted file mode 100644
index 34f8dfd..0000000
--- a/app/src/main/jni/libvorbis-jni/com_loroclip_decoder_VorbisDecoder.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <vorbis/codec.h>
-#include <android/log.h>
-
-#ifndef _Included_com_loroclip_decoder_VorbisDecoder
-#define _Included_com_loroclip_decoder_VorbisDecoder
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//Starts the decoding from a vorbis bitstream to pcm
-JNIEXPORT int JNICALL Java_com_loroclip_decoder_VorbisDecoder_startDecoding
-  (JNIEnv *env, jclass cls, jobject vorbisDataFeed);
-
-//Stops the vorbis data feed
-void stopDecodeFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* stopMethodId);
-
-//Reads raw vorbis data from the jni callback
-int readVorbisDataFromVorbisDataFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* readVorbisDataMethodId, char* buffer, jbyteArray* jByteArrayReadBuffer);
-
-//Writes the pcm data to the Java layer
-void writePCMDataFromVorbisDataFeed(JNIEnv *env, jobject* vorbisDataFeed, jmethodID* writePCMDataMethodId, ogg_int16_t* buffer, int bytes, jshortArray* jShortArrayWriteBuffer);
-
-//Starts the decode feed with the necessary information about sample rates, channels, etc about the stream
-void start(JNIEnv *env, jobject *vorbisDataFeed, jmethodID* startMethodId, long sampleRate, long channels, char* vendor);
-
-//Starts reading the header information
-void startReadingHeader(JNIEnv *env, jobject *vorbisDataFeed, jmethodID* startReadingHeaderMethodId);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
\ No newline at end of file
diff --git a/app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.c b/app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c
similarity index 97%
rename from app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.c
rename to app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c
index 005c7fe..744637c 100644
--- a/app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.c
+++ b/app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c
@@ -1,4 +1,4 @@
-#include "com_loroclip_record_encoder_VorbisEncoder.h"
+#include "com_loroclip_util_encoder_VorbisEncoder.h"
 
 /*message codes to send to the java layer*/
 #define ERROR_INITIALIZING -44
@@ -85,7 +85,7 @@ int startEncoding(JNIEnv *env, jclass *cls_ptr, jlong *sampleRate_ptr, jlong *ch
     jbyteArray jByteArrayWriteBuffer = (*env)->NewByteArray(env, READ*8);
 
     //Find our java classes we'll be calling
-    jclass encoderDataFeedClass = (*env)->FindClass(env, "com/loroclip/record/encoder/EncodeFeed");
+    jclass encoderDataFeedClass = (*env)->FindClass(env, "com/loroclip/util/encoder/EncodeFeed");
 
 
 
@@ -300,7 +300,7 @@ int startEncoding(JNIEnv *env, jclass *cls_ptr, jlong *sampleRate_ptr, jlong *ch
 
 
 
-JNIEXPORT jint JNICALL Java_com_loroclip_record_encoder_VorbisEncoder_startEncodingWithQuality
+JNIEXPORT jint JNICALL Java_com_loroclip_util_encoder_VorbisEncoder_startEncodingWithQuality
 (JNIEnv *env, jclass cls, jlong sampleRate, jlong channels, jfloat quality, jobject encoderDataFeed) {
     startEncoding(env, &cls, &sampleRate, &channels, &quality, &NO_BITRATE, &encoderDataFeed, WITH_QUALITY);
 }
@@ -310,7 +310,7 @@ JNIEXPORT jint JNICALL Java_com_loroclip_record_encoder_VorbisEncoder_startEncod
  * Method:    startEncodingWithBitrate
  * Signature: (JJJLcom/loroclip/encoder/EncodeFeed;)I
  */
-JNIEXPORT jint JNICALL Java_com_loroclip_record_encoder_VorbisEncoder_startEncodingWithBitrate
+JNIEXPORT jint JNICALL Java_com_loroclip_util_encoder_VorbisEncoder_startEncodingWithBitrate
 (JNIEnv *env, jclass cls, jlong sampleRate, jlong channels, jlong bitrate, jobject encoderDataFeed) {
     startEncoding(env, &cls, &sampleRate, &channels, &NO_QUALITY, &bitrate, &encoderDataFeed, WITH_BITRATE);
 }
\ No newline at end of file
diff --git a/app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.h b/app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h
similarity index 83%
rename from app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.h
rename to app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h
index 742ba36..27af29c 100644
--- a/app/src/main/jni/libvorbis-jni/com_loroclip_record_encoder_VorbisEncoder.h
+++ b/app/src/main/jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h
@@ -8,8 +8,8 @@
 #include <android/log.h>
 
 
-#ifndef _Included_com_loroclip_record_encoder_VorbisEncoder
-#define _Included_com_loroclip_record_encoder_VorbisEncoder
+#ifndef _Included_com_loroclip_util_encoder_VorbisEncoder
+#define _Included_com_loroclip_util_encoder_VorbisEncoder
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,14 +36,14 @@ int startEncoding(JNIEnv *env, jclass *cls_ptr, jlong *sampleRate_ptr, jlong *ch
  * Method:    startEncodingWithQuality
  * Signature: (JJFLcom/loroclip/encoder/EncodeFeed;)I
  */
-JNIEXPORT jint JNICALL Java_com_loroclip_record_encoder_VorbisEncoder_startEncodingWithQuality
+JNIEXPORT jint JNICALL Java_com_loroclip_util_encoder_VorbisEncoder_startEncodingWithQuality
 (JNIEnv *env, jclass cls, jlong sampleRate, jlong channels, jfloat quality, jobject encoderDataFeed);
 /*
  * Class:     com_loroclip_encoder_VorbisEncoder
  * Method:    startEncodingWithBitrate
  * Signature: (JJJLcom/loroclip/encoder/EncodeFeed;)I
  */
-JNIEXPORT jint JNICALL Java_com_loroclip_record_encoder_VorbisEncoder_startEncodingWithBitrate
+JNIEXPORT jint JNICALL Java_com_loroclip_util_encoder_VorbisEncoder_startEncodingWithBitrate
 (JNIEnv *env, jclass cls, jlong sampleRate, jlong channels, jlong bitrate, jobject encoderDataFeed);
 
 #ifdef __cplusplus
diff --git a/app/src/main/libs/armeabi-v7a/libvorbis-jni.so b/app/src/main/libs/armeabi-v7a/libvorbis-jni.so
index 6182996..19536bf 100755
Binary files a/app/src/main/libs/armeabi-v7a/libvorbis-jni.so and b/app/src/main/libs/armeabi-v7a/libvorbis-jni.so differ
diff --git a/app/src/main/libs/armeabi/libvorbis-jni.so b/app/src/main/libs/armeabi/libvorbis-jni.so
index 2d6ed83..c6f805f 100755
Binary files a/app/src/main/libs/armeabi/libvorbis-jni.so and b/app/src/main/libs/armeabi/libvorbis-jni.so differ
diff --git a/app/src/main/libs/mips/libvorbis-jni.so b/app/src/main/libs/mips/libvorbis-jni.so
index 26f6cc8..59a1970 100755
Binary files a/app/src/main/libs/mips/libvorbis-jni.so and b/app/src/main/libs/mips/libvorbis-jni.so differ
diff --git a/app/src/main/libs/x86/libvorbis-jni.so b/app/src/main/libs/x86/libvorbis-jni.so
index aa6182b..a68f9c2 100755
Binary files a/app/src/main/libs/x86/libvorbis-jni.so and b/app/src/main/libs/x86/libvorbis-jni.so differ
diff --git a/app/src/main/obj/local/armeabi-v7a/libvorbis-jni.so b/app/src/main/obj/local/armeabi-v7a/libvorbis-jni.so
index 9b61406..f355f5d 100755
Binary files a/app/src/main/obj/local/armeabi-v7a/libvorbis-jni.so and b/app/src/main/obj/local/armeabi-v7a/libvorbis-jni.so differ
diff --git a/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o b/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o
new file mode 100644
index 0000000..c21ff2d
Binary files /dev/null and b/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o differ
diff --git a/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d b/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
new file mode 100644
index 0000000..5a74c97
--- /dev/null
+++ b/app/src/main/obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
@@ -0,0 +1,137 @@
+obj/local/armeabi-v7a/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o: \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/jni.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/api-level.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdio.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdint.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_wchar_limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/stddef.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/compiler.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/kernel.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdlib.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/string.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/malloc.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/alloca.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/strings.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/memory.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/math.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/internal_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/syslimits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/page.h \
+ jni/libvorbis-jni/../include/vorbis/vorbisenc.h \
+ jni/libvorbis-jni/../include/vorbis/codec.h \
+ jni/libvorbis-jni/../include/ogg/ogg.h \
+ jni/libvorbis-jni/../include/ogg/os_types.h \
+ jni/libvorbis-jni/../include/ogg/config_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/inttypes.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/log.h
+
+jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/jni.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/api-level.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdio.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdint.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_wchar_limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/stddef.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/compiler.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/kernel.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdlib.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/string.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/malloc.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/alloca.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/strings.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/memory.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/math.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/internal_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/syslimits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/page.h:
+
+jni/libvorbis-jni/../include/vorbis/vorbisenc.h:
+
+jni/libvorbis-jni/../include/vorbis/codec.h:
+
+jni/libvorbis-jni/../include/ogg/ogg.h:
+
+jni/libvorbis-jni/../include/ogg/os_types.h:
+
+jni/libvorbis-jni/../include/ogg/config_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/inttypes.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/log.h:
diff --git a/app/src/main/obj/local/armeabi/libvorbis-jni.so b/app/src/main/obj/local/armeabi/libvorbis-jni.so
index 50a286f..0c66d54 100755
Binary files a/app/src/main/obj/local/armeabi/libvorbis-jni.so and b/app/src/main/obj/local/armeabi/libvorbis-jni.so differ
diff --git a/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o b/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o
new file mode 100644
index 0000000..1fe90b3
Binary files /dev/null and b/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o differ
diff --git a/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d b/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
new file mode 100644
index 0000000..5ef5f72
--- /dev/null
+++ b/app/src/main/obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
@@ -0,0 +1,137 @@
+obj/local/armeabi/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o: \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/jni.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/api-level.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdio.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdint.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_wchar_limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/stddef.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/compiler.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/kernel.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdlib.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/string.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/malloc.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/alloca.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/strings.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/memory.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/time.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/math.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/internal_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/syslimits.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/page.h \
+ jni/libvorbis-jni/../include/vorbis/vorbisenc.h \
+ jni/libvorbis-jni/../include/vorbis/codec.h \
+ jni/libvorbis-jni/../include/ogg/ogg.h \
+ jni/libvorbis-jni/../include/ogg/os_types.h \
+ jni/libvorbis-jni/../include/ogg/config_types.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/inttypes.h \
+ /Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/log.h
+
+jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/jni.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/api-level.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdio.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdint.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/_wchar_limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/stddef.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/compiler.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/kernel.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/stdlib.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/string.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/malloc.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/alloca.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/strings.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/memory.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/math.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/linux/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/internal_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/machine/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/sys/syslimits.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/asm/page.h:
+
+jni/libvorbis-jni/../include/vorbis/vorbisenc.h:
+
+jni/libvorbis-jni/../include/vorbis/codec.h:
+
+jni/libvorbis-jni/../include/ogg/ogg.h:
+
+jni/libvorbis-jni/../include/ogg/os_types.h:
+
+jni/libvorbis-jni/../include/ogg/config_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/inttypes.h:
+
+/Applications/android-ndk-r10d/platforms/android-3/arch-arm/usr/include/android/log.h:
diff --git a/app/src/main/obj/local/mips/libvorbis-jni.so b/app/src/main/obj/local/mips/libvorbis-jni.so
index 882331f..74dbd2f 100755
Binary files a/app/src/main/obj/local/mips/libvorbis-jni.so and b/app/src/main/obj/local/mips/libvorbis-jni.so differ
diff --git a/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o b/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o
new file mode 100644
index 0000000..008deca
Binary files /dev/null and b/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o differ
diff --git a/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d b/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
new file mode 100644
index 0000000..b913552
--- /dev/null
+++ b/app/src/main/obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
@@ -0,0 +1,140 @@
+obj/local/mips/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o: \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/jni.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/cdefs.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/cdefs_elf.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/android/api-level.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdio.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdint.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/_wchar_limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/stddef.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/compiler.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/sgidefs.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/kernel.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/sysmacros.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdlib.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/string.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/malloc.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/alloca.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/strings.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/memory.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm-generic/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/math.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/internal_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/syslimits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/page.h \
+ jni/libvorbis-jni/../include/vorbis/vorbisenc.h \
+ jni/libvorbis-jni/../include/vorbis/codec.h \
+ jni/libvorbis-jni/../include/ogg/ogg.h \
+ jni/libvorbis-jni/../include/ogg/os_types.h \
+ jni/libvorbis-jni/../include/ogg/config_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/inttypes.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/android/log.h
+
+jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/jni.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/cdefs.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/cdefs_elf.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/android/api-level.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdio.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdint.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/_wchar_limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/stddef.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/compiler.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/sgidefs.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/kernel.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/sysmacros.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/stdlib.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/string.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/malloc.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/alloca.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/strings.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/memory.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm-generic/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/math.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/linux/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/internal_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/machine/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/sys/syslimits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/asm/page.h:
+
+jni/libvorbis-jni/../include/vorbis/vorbisenc.h:
+
+jni/libvorbis-jni/../include/vorbis/codec.h:
+
+jni/libvorbis-jni/../include/ogg/ogg.h:
+
+jni/libvorbis-jni/../include/ogg/os_types.h:
+
+jni/libvorbis-jni/../include/ogg/config_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/inttypes.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-mips/usr/include/android/log.h:
diff --git a/app/src/main/obj/local/x86/libvorbis-jni.so b/app/src/main/obj/local/x86/libvorbis-jni.so
index fc53e40..1715d8b 100755
Binary files a/app/src/main/obj/local/x86/libvorbis-jni.so and b/app/src/main/obj/local/x86/libvorbis-jni.so differ
diff --git a/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o b/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o
new file mode 100644
index 0000000..8c46cd3
Binary files /dev/null and b/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o differ
diff --git a/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d b/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
new file mode 100644
index 0000000..85e2df3
--- /dev/null
+++ b/app/src/main/obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o.d
@@ -0,0 +1,143 @@
+obj/local/x86/objs/vorbis-jni/com_loroclip_util_encoder_VorbisEncoder.o: \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.c \
+ jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/jni.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/cdefs.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/cdefs_elf.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/android/api-level.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdio.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdint.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/_wchar_limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/stddef.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/compiler.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/posix_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/posix_types_32.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/kernel.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/sysmacros.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdlib.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/string.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/malloc.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/alloca.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/strings.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/memory.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/time.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm-generic/siginfo.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/math.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/internal_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/limits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/syslimits.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/page.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/page_32.h \
+ jni/libvorbis-jni/../include/vorbis/vorbisenc.h \
+ jni/libvorbis-jni/../include/vorbis/codec.h \
+ jni/libvorbis-jni/../include/ogg/ogg.h \
+ jni/libvorbis-jni/../include/ogg/os_types.h \
+ jni/libvorbis-jni/../include/ogg/config_types.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/inttypes.h \
+ /Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/android/log.h
+
+jni/libvorbis-jni/com_loroclip_util_encoder_VorbisEncoder.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/jni.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/cdefs.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/cdefs_elf.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/android/api-level.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdio.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdint.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/_wchar_limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/stddef.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/compiler.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/posix_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/posix_types_32.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/kernel.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/sysmacros.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/stdlib.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/string.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/malloc.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/alloca.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/strings.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/memory.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/time.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm-generic/siginfo.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/math.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/linux/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/internal_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/machine/limits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/sys/syslimits.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/page.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/asm/page_32.h:
+
+jni/libvorbis-jni/../include/vorbis/vorbisenc.h:
+
+jni/libvorbis-jni/../include/vorbis/codec.h:
+
+jni/libvorbis-jni/../include/ogg/ogg.h:
+
+jni/libvorbis-jni/../include/ogg/os_types.h:
+
+jni/libvorbis-jni/../include/ogg/config_types.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/inttypes.h:
+
+/Applications/android-ndk-r10d/platforms/android-9/arch-x86/usr/include/android/log.h:
diff --git a/app/src/main/res/layout/activity_play2.xml b/app/src/main/res/layout/activity_play2.xml
index 5d39164..3d7142c 100644
--- a/app/src/main/res/layout/activity_play2.xml
+++ b/app/src/main/res/layout/activity_play2.xml
@@ -1,4 +1,4 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:id="@+id/fragment"
-    android:name="com.loroclip.PlayActivityFragment" tools:layout="@layout/fragment_play"
+    android:name="com.loroclip.view.PlayActivityFragment" tools:layout="@layout/fragment_play"
     android:layout_width="match_parent" android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_record.xml b/app/src/main/res/layout/activity_record.xml
index e2ea9c7..1ddfba1 100644
--- a/app/src/main/res/layout/activity_record.xml
+++ b/app/src/main/res/layout/activity_record.xml
@@ -7,7 +7,7 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 android:paddingBottom="@dimen/activity_vertical_margin"
                 android:orientation="vertical"
-                tools:context="com.loroclip.record.RecordActivity"
+                tools:context="com.loroclip.view.RecordActivity"
               android:weightSum="1">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/editor.xml b/app/src/main/res/layout/editor.xml
index 8cbf694..b33d80a 100644
--- a/app/src/main/res/layout/editor.xml
+++ b/app/src/main/res/layout/editor.xml
@@ -40,7 +40,7 @@
          android:layout_width="wrap_content"
          android:layout_height="160dp">
 
-          <com.loroclip.WaveformView
+          <com.loroclip.view.WaveformView
            android:id="@+id/waveform"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent" />
diff --git a/app/src/main/res/layout/fragment_play.xml b/app/src/main/res/layout/fragment_play.xml
index c95e0c2..f02b857 100644
--- a/app/src/main/res/layout/fragment_play.xml
+++ b/app/src/main/res/layout/fragment_play.xml
@@ -4,7 +4,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.loroclip.PlayActivityFragment">
+    tools:context="com.loroclip.view.PlayActivityFragment">
 
     <TextView android:text="@string/hello_world" android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/saved_bookmark_history_list_dialog.xml b/app/src/main/res/layout/saved_bookmark_history_list_dialog.xml
index 6b781f3..238487a 100644
--- a/app/src/main/res/layout/saved_bookmark_history_list_dialog.xml
+++ b/app/src/main/res/layout/saved_bookmark_history_list_dialog.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.loroclip.BookmarkListView
+    <com.loroclip.view.BookmarkListView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/bookmark_dialog_listview" />
diff --git a/app/src/main/res/menu/menu_play.xml b/app/src/main/res/menu/menu_play.xml
index c6cfe04..34418d0 100644
--- a/app/src/main/res/menu/menu_play.xml
+++ b/app/src/main/res/menu/menu_play.xml
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" tools:context="com.loroclip.PlayActivity">
+    xmlns:tools="http://schemas.android.com/tools" tools:context="com.loroclip.view.PlayActivity">
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
         android:orderInCategory="100" app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/resources/com/loroclip/soundfile/.gitignore b/app/src/main/resources/com/loroclip/soundfile/.gitignore
deleted file mode 100644
index ab31b20..0000000
--- a/app/src/main/resources/com/loroclip/soundfile/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.class
-