diff --git a/src/com/nitobi/phonegap/AudioHandler.java b/src/com/nitobi/phonegap/AudioHandler.java
new file mode 100644
index 00000000..a0e32e49
--- /dev/null
+++ b/src/com/nitobi/phonegap/AudioHandler.java
@@ -0,0 +1,177 @@
+package com.nitobi.phonegap;
+
+import java.io.File;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.OnErrorListener;
+import android.media.MediaRecorder;
+import android.media.MediaPlayer.OnBufferingUpdateListener;
+import android.media.MediaPlayer.OnCompletionListener;
+import android.media.MediaPlayer.OnPreparedListener;
+import android.util.Log;
+
+public class AudioHandler implements OnCompletionListener, OnPreparedListener, OnErrorListener {
+	private MediaRecorder recorder;
+	private boolean isRecording = false;
+	MediaPlayer mPlayer;
+	private boolean isPlaying = false;
+	private String recording;
+	private String saveFile;
+	private Context mCtx;
+	
+	public AudioHandler(String file, Context ctx) {
+		this.recording = file;
+		this.mCtx = ctx;
+	}
+	
+	protected void startRecording(String file){
+		if (!isRecording){
+			saveFile=file;
+			recorder = new MediaRecorder();
+			recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+			recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+			recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+			recorder.setOutputFile(this.recording);
+			recorder.prepare();
+			isRecording = true;
+			recorder.start();
+		}
+	}
+	
+	private void moveFile(String file) {
+		/* this is a hack to save the file as the specified name */
+		File f = new File (this.recording);
+		f.renameTo(new File("/sdcard" + file));
+	}
+	
+	protected void stopRecording(){
+		try{
+			if((recorder != null)&&(isRecording))
+			{
+				isRecording = false;
+				recorder.stop();
+		        recorder.release(); 
+			}
+			moveFile(saveFile);
+		}catch (Exception e){e.printStackTrace();}
+	}	
+	
+	protected void startPlaying(String file) {
+		if (isPlaying==false) {
+			try {
+				mPlayer = new MediaPlayer();
+				isPlaying=true;
+				Log.d("Audio startPlaying", "audio: " + file);
+				if (isStreaming(file))
+				{
+					Log.d("AudioStartPlaying", "Streaming");
+					// Streaming prepare async
+					mPlayer.setDataSource(file);
+					mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);  
+					mPlayer.prepareAsync();
+				} else {
+					Log.d("AudioStartPlaying", "File");
+					// Not streaming prepare synchronous, abstract base directory
+					mPlayer.setDataSource("/sdcard/" + file);
+					mPlayer.prepare();
+				}
+				mPlayer.setOnPreparedListener(this);
+			} catch (Exception e) { e.printStackTrace(); }
+		}
+	} 
+
+	protected void stopPlaying() {
+		if (isPlaying) {
+			mPlayer.stop();
+			mPlayer.release();
+			isPlaying=false;
+		}
+	}
+	
+	public void onCompletion(MediaPlayer mPlayer) {
+		mPlayer.stop();
+		mPlayer.release();
+		isPlaying=false;
+    } 
+	
+	protected long getCurrentPosition() {
+		if (isPlaying) 
+		{
+			return(mPlayer.getCurrentPosition());
+		} else { return(-1); }
+	}
+	
+	private boolean isStreaming(String file) 
+	{
+		if (file.contains("http://")) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	protected long getDuration(String file) {
+		long duration = -2;
+		if (!isPlaying & !isStreaming(file)) {
+			try {
+				mPlayer = new MediaPlayer();
+				mPlayer.setDataSource("/sdcard/" + file);
+				mPlayer.prepare();
+				duration = mPlayer.getDuration();
+				mPlayer.release();
+			} catch (Exception e) { e.printStackTrace(); return(-3); }
+		} else
+		if (isPlaying & !isStreaming(file)) {
+			duration = mPlayer.getDuration();
+		} else 
+		if (isPlaying & isStreaming(file)) {
+			try {
+				duration = mPlayer.getDuration();
+			} catch (Exception e) { e.printStackTrace(); return(-4); }
+		}else { return -1; }
+		return duration;
+	}
+
+	public void onPrepared(MediaPlayer mPlayer) {
+		if (isPlaying) {
+			mPlayer.setOnCompletionListener(this);
+			mPlayer.setOnBufferingUpdateListener(new OnBufferingUpdateListener()
+			{
+				public void onBufferingUpdate(MediaPlayer mPlayer, int percent)
+				{
+					/* TODO: call back, e.g. update outer progress bar */
+					Log.d("AudioOnBufferingUpdate", "percent: " + percent); 
+				}
+			});
+			mPlayer.start();
+		}
+	}
+
+	public boolean onError(MediaPlayer mPlayer, int arg1, int arg2) {
+		Log.e("AUDIO onError", "error " + arg1 + " " + arg2);
+		return false;
+	}
+	
+	protected void setAudioOutputDevice(int output){
+		// Changes the default audio output device to speaker or earpiece 
+		AudioManager audiMgr = (AudioManager) mCtx.getSystemService(Context.AUDIO_SERVICE);
+		if (output == (2))
+			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
+		else if (output == (1)){
+			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
+		}else
+			Log.e("AudioHandler setAudioOutputDevice", " unknown output device");	
+	}
+	
+	protected int getAudioOutputDevice(){
+		AudioManager audiMgr = (AudioManager) mCtx.getSystemService(Context.AUDIO_SERVICE);
+		if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE)
+			return 1;
+		else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEAKER)
+			return 2;
+		else
+			return -1;
+	}
+}
diff --git a/src/com/nitobi/phonegap/DirectoryManager.java b/src/com/nitobi/phonegap/DirectoryManager.java
new file mode 100644
index 00000000..2fdb45fd
--- /dev/null
+++ b/src/com/nitobi/phonegap/DirectoryManager.java
@@ -0,0 +1,126 @@
+package com.nitobi.phonegap;
+
+import java.io.File;
+
+import android.os.Environment;
+import android.os.StatFs;
+import android.util.Log;
+
+public class DirectoryManager {
+	
+	protected boolean testFileExists (String name){
+		boolean status;
+		if ((testSaveLocationExists())&&(!name.equals(""))){
+    		File path = Environment.getExternalStorageDirectory();
+            File newPath = constructFilePaths(path.toString(), name);
+            status = newPath.exists();
+    	}else{
+    		status = false;
+    	}
+		return status;
+	}
+	
+	protected long getFreeDiskSpace(){
+		/*
+		 * gets the available SD card free space or returns -1 if the SD card is not mounted.
+		 */
+		String status = Environment.getExternalStorageState();
+		long freeSpace = 0;
+		if (status.equals(Environment.MEDIA_MOUNTED)) {
+			try {
+				File path = Environment.getExternalStorageDirectory();
+				StatFs stat = new StatFs(path.getPath());
+				long blockSize = stat.getBlockSize();
+				long availableBlocks = stat.getAvailableBlocks();
+				freeSpace = availableBlocks*blockSize/1024;
+			} catch (Exception e) {e.printStackTrace(); }
+		} else { return -1; }
+		return (freeSpace);
+	}	
+	
+	protected boolean createDirectory(String directoryName){
+		boolean status;
+		if ((testSaveLocationExists())&&(!directoryName.equals(""))){
+			File path = Environment.getExternalStorageDirectory();
+            File newPath = constructFilePaths(path.toString(), directoryName);
+			status = newPath.mkdir();
+			status = true;
+		}else
+			status = false;
+		return status;
+	}
+	
+	protected boolean testSaveLocationExists(){
+		String sDCardStatus = Environment.getExternalStorageState();
+		boolean status;
+		if (sDCardStatus.equals(Environment.MEDIA_MOUNTED)){
+			status = true;
+		}else
+			status = false;
+		return status;
+	}
+	
+	protected boolean deleteDirectory(String fileName){
+		boolean status;
+		SecurityManager checker = new SecurityManager();
+			
+		if ((testSaveLocationExists())&&(!fileName.equals(""))){
+		
+			File path = Environment.getExternalStorageDirectory();
+            File newPath = constructFilePaths(path.toString(), fileName);
+			checker.checkDelete(newPath.toString());
+			if(newPath.isDirectory()){
+				String[] listfile = newPath.list();
+				// delete all files within the specified directory and then delete the directory
+				try{
+					for (int i=0; i < listfile.length; i++){
+						File deletedFile = new File (newPath.toString()+"/"+listfile[i].toString());
+						deletedFile.delete();
+					}
+					newPath.delete();
+					Log.i("DirectoryManager deleteDirectory", fileName);
+					status = true;
+				}catch (Exception e){
+					e.printStackTrace();
+					status = false;
+				}
+				
+			}else
+				status = false;
+		}else
+			status = false;
+		return status;
+	}
+	
+	protected boolean deleteFile(String fileName){
+		boolean status;
+		SecurityManager checker = new SecurityManager();
+			
+		if ((testSaveLocationExists())&&(!fileName.equals(""))){
+		
+			File path = Environment.getExternalStorageDirectory();
+            File newPath = constructFilePaths(path.toString(), fileName);
+			checker.checkDelete(newPath.toString());
+			if (newPath.isFile()){
+				try {
+					Log.i("DirectoryManager deleteFile", fileName);
+					newPath.delete();
+					status = true;
+				}catch (SecurityException se){
+					se.printStackTrace();
+					status = false;
+				}
+			}else
+				status = false;
+		}else
+			status = false;
+		return status;
+	}
+	
+	private File constructFilePaths (String file1, String file2){
+		File newPath;
+		newPath = new File(file1+"/"+file2);
+		return newPath;
+	}
+
+}
\ No newline at end of file