From 82d602216d73d50e10a47e8b2ead0e7ca425cefe Mon Sep 17 00:00:00 2001
From: Raph Levien <raph@google.com>
Date: Sat, 8 Jun 2013 20:50:44 -0700
Subject: [PATCH] Rename package to com.levien.synthesizer

The "com.google" namespace is reserved for official releases, so
renaming to "com.levien".

Also small tweaking to piano2.xml to clean it up for release (arguably
should have been separate commit, but oh well).
---
 .../.externalToolBuilders/NDK Builder.launch  |  2 +-
 .../Proto Builder.launch                      |  4 +-
 android/AndroidManifest.xml                   | 28 +++++------
 android/res/layout/amplification.xml          | 18 +++----
 android/res/layout/chord_grid.xml             |  6 +--
 android/res/layout/effects.xml                | 18 +++----
 android/res/layout/karplus_strong.xml         | 18 +++----
 android/res/layout/low_pass_filter.xml        | 18 +++----
 android/res/layout/main.xml                   |  6 +--
 android/res/layout/oscillator.xml             | 20 ++++----
 android/res/layout/piano.xml                  |  8 +--
 android/res/layout/piano2.xml                 | 12 +++--
 android/res/layout/score.xml                  |  8 +--
 android/res/layout/tremolo.xml                | 20 ++++----
 android/res/layout/vibrato.xml                | 20 ++++----
 .../synthesizer/android/AndroidGlue.java      |  4 +-
 .../synthesizer/android/Storage.java          |  4 +-
 .../android/service/SynthesizerService.java   |  8 +--
 .../android/service/SynthesizerThread.java    |  6 +--
 .../android/stats/JitterStats.java            |  2 +-
 .../android/ui/AmplificationActivity.java     | 12 ++---
 .../android/ui/ChordGridActivity.java         |  8 +--
 .../android/ui/EditInstrumentActivity.java    |  8 +--
 .../android/ui/EffectsActivity.java           | 12 ++---
 .../android/ui/InstrumentListActivity.java    |  6 +--
 .../android/ui/KarplusStrongActivity.java     | 12 ++---
 .../android/ui/LowPassFilterActivity.java     | 12 ++---
 .../synthesizer/android/ui/MainActivity.java  |  8 +--
 .../android/ui/OscillatorActivity.java        | 14 +++---
 .../synthesizer/android/ui/PianoActivity.java | 12 ++---
 .../android/ui/PianoActivity2.java            | 21 ++++----
 .../synthesizer/android/ui/ScoreActivity.java | 14 +++---
 .../android/ui/SynthesizerActivity.java       | 12 ++---
 .../android/ui/TremoloActivity.java           | 14 +++---
 .../android/ui/VibratoActivity.java           | 14 +++---
 .../android/widgets/ChordGridView.java        | 10 ++--
 .../android/widgets/knob/KnobListener.java    |  2 +-
 .../widgets/knob/KnobPlaceholderView.java     |  2 +-
 .../android/widgets/knob/KnobView.java        | 10 ++--
 .../android/widgets/piano/BlackPianoKey.java  |  6 +--
 .../android/widgets/piano/NotePianoKey.java   |  4 +-
 .../android/widgets/piano/OctavePianoKey.java |  4 +-
 .../android/widgets/piano/PianoKey.java       |  6 +--
 .../android/widgets/piano/PianoView.java      | 15 +++---
 .../widgets/piano/PianoViewListener.java      |  4 +-
 .../android/widgets/piano/WhitePianoKey.java  |  6 +--
 .../android/widgets/score/EditEventTool.java  |  6 +--
 .../widgets/score/HideChannelButton.java      |  4 +-
 .../android/widgets/score/NewEventTool.java   |  6 +--
 .../android/widgets/score/NewLoopTool.java    |  6 +--
 .../android/widgets/score/PlayButton.java     |  8 +--
 .../android/widgets/score/PlayTool.java       |  6 +--
 .../android/widgets/score/ScoreView.java      | 12 ++---
 .../widgets/score/ScoreViewListener.java      |  2 +-
 .../android/widgets/score/ScoreViewTool.java  |  4 +-
 .../widgets/score/ScoreViewToolbar.java       |  4 +-
 .../widgets/score/SelectChannelButton.java    |  2 +-
 .../android/widgets/score/SnapTool.java       |  4 +-
 .../android/widgets/score/ViewportTool.java   |  4 +-
 .../widgets/waveform/WaveformListener.java    |  2 +-
 .../widgets/waveform/WaveformRowView.java     |  6 +--
 .../widgets/waveform/WaveformView.java        | 10 ++--
 .../core/midi/MessageInputProcessor.java      |  2 +-
 .../core/midi/MessageOutputProcessor.java     |  2 +-
 .../synthesizer/core/midi/MidiAdapter.java    |  2 +-
 .../core/midi/MidiChannelFilter.java          |  2 +-
 .../synthesizer/core/midi/MidiEvent.java      |  2 +-
 .../synthesizer/core/midi/MidiFile.java       |  2 +-
 .../synthesizer/core/midi/MidiFilePlayer.java |  2 +-
 .../synthesizer/core/midi/MidiHeader.java     |  4 +-
 .../synthesizer/core/midi/MidiListener.java   |  2 +-
 .../core/midi/MidiListenerProxy.java          |  2 +-
 .../synthesizer/core/midi/MidiReader.java     |  2 +-
 .../synthesizer/core/midi/MidiTrack.java      |  2 +-
 .../synthesizer/core/midi/MidiUtil.java       |  2 +-
 .../core/model/CachedFrequencyProvider.java   |  2 +-
 .../core/model/CachedSignalProvider.java      |  2 +-
 .../synthesizer/core/model/Envelope.java      |  2 +-
 .../core/model/FrequencyProvider.java         |  2 +-
 .../core/model/SignalProvider.java            |  2 +-
 .../synthesizer/core/model/SynthesisTime.java |  2 +-
 .../core/model/SynthesizerInput.java          |  2 +-
 .../synthesizer/core/model/WaveformInput.java |  2 +-
 .../core/model/composite/MidiSynthesizer.java |  8 +--
 .../composite/MultiChannelSynthesizer.java    | 16 +++---
 .../composite/MultiTouchSynthesizer.java      | 50 +++++++++----------
 .../core/model/composite/Presets.proto        |  2 +-
 .../core/model/modules/AdsrEnvelope.java      | 10 ++--
 .../core/model/modules/Amplifier.java         |  6 +--
 .../synthesizer/core/model/modules/Delay.java |  8 +--
 .../synthesizer/core/model/modules/Echo.java  |  8 +--
 .../synthesizer/core/model/modules/Glide.java | 10 ++--
 .../core/model/modules/LowPassFilter.java     |  8 +--
 .../synthesizer/core/model/modules/Mixer.java |  6 +--
 .../core/model/modules/Tremolo.java           |  6 +--
 .../synthesizer/core/model/modules/Tuner.java |  8 +--
 .../core/model/modules/WaveformSelector.java  | 20 ++++----
 .../core/model/oscillator/DrawbarOrgan.java   |  8 +--
 .../core/model/oscillator/KarplusStrong.java  | 10 ++--
 .../core/model/oscillator/Noise.java          |  6 +--
 .../core/model/oscillator/Oscillator.java     |  6 +--
 .../core/model/oscillator/Sawtooth.java       |  6 +--
 .../core/model/oscillator/Sine.java           |  8 +--
 .../core/model/oscillator/Square.java         |  6 +--
 .../core/model/oscillator/Triangle.java       |  6 +--
 .../core/music/EventComparator.java           |  4 +-
 .../synthesizer/core/music/Music.proto        |  2 +-
 .../synthesizer/core/music/Note.java          |  2 +-
 .../synthesizer/core/music/ScorePlayer.java   |  8 +--
 .../core/music/ScorePlayerListener.java       |  2 +-
 .../synthesizer/core/soundfont/Bag.java       |  6 +--
 .../synthesizer/core/soundfont/Generator.java |  4 +-
 .../core/soundfont/Instrument.java            |  6 +--
 .../synthesizer/core/soundfont/Modulator.java |  6 +--
 .../core/soundfont/ModulatorSource.java       |  2 +-
 .../synthesizer/core/soundfont/Operator.java  |  2 +-
 .../synthesizer/core/soundfont/Preset.java    |  6 +--
 .../synthesizer/core/soundfont/Sample.java    |  6 +--
 .../core/soundfont/SampleLink.java            |  2 +-
 .../core/soundfont/SoundFontOscillator.java   | 14 +++---
 .../core/soundfont/SoundFontReader.java       |  6 +--
 .../synthesizer/core/soundfont/Zone.java      |  2 +-
 .../core/wave/RiffInputStream.java            |  2 +-
 .../synthesizer/core/wave/WaveAdapter.java    |  8 +--
 .../synthesizer/core/wave/WaveReader.java     |  2 +-
 .../synthesizer/core/wave/WaveWriter.java     |  2 +-
 cpp/src/android_glue.cc                       | 12 ++---
 .../model/modules/test/AdsrEnvelopeTest.java  |  8 +--
 .../model/modules/test/AmplifierTest.java     | 10 ++--
 .../core/model/modules/test/DelayTest.java    |  8 +--
 .../core/model/modules/test/EchoTest.java     |  8 +--
 .../core/model/modules/test/GlideTest.java    |  8 +--
 .../core/model/modules/test/MixerTest.java    |  8 +--
 .../core/model/modules/test/TremoloTest.java  |  8 +--
 .../core/model/modules/test/TunerTest.java    | 10 ++--
 .../model/oscillator/test/OscillatorTest.java |  8 +--
 .../model/oscillator/test/SawtoothTest.java   |  8 +--
 .../core/model/oscillator/test/SineTest.java  |  8 +--
 .../model/oscillator/test/SquareTest.java     |  8 +--
 .../model/oscillator/test/TriangleTest.java   |  8 +--
 .../test/CachedFrequencyProviderTest.java     |  6 +--
 .../model/test/CachedSignalProviderTest.java  |  6 +--
 .../core/model/test/SynthesisTimeTest.java    |  4 +-
 .../core/model/test/SynthesizerInputTest.java |  6 +--
 144 files changed, 536 insertions(+), 530 deletions(-)
 rename android/src/com/{google => levien}/synthesizer/android/AndroidGlue.java (92%)
 rename android/src/com/{google => levien}/synthesizer/android/Storage.java (99%)
 rename android/src/com/{google => levien}/synthesizer/android/service/SynthesizerService.java (95%)
 rename android/src/com/{google => levien}/synthesizer/android/service/SynthesizerThread.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/stats/JitterStats.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/AmplificationActivity.java (85%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/ChordGridActivity.java (91%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/EditInstrumentActivity.java (95%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/EffectsActivity.java (82%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/InstrumentListActivity.java (93%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/KarplusStrongActivity.java (84%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/LowPassFilterActivity.java (87%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/MainActivity.java (94%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/OscillatorActivity.java (84%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/PianoActivity.java (88%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/PianoActivity2.java (95%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/ScoreActivity.java (91%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/SynthesizerActivity.java (94%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/TremoloActivity.java (85%)
 rename android/src/com/{google => levien}/synthesizer/android/ui/VibratoActivity.java (84%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/ChordGridView.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/knob/KnobListener.java (93%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/knob/KnobPlaceholderView.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/knob/KnobView.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/BlackPianoKey.java (96%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/NotePianoKey.java (96%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/OctavePianoKey.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/PianoKey.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/PianoView.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/PianoViewListener.java (94%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/piano/WhitePianoKey.java (95%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/EditEventTool.java (99%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/HideChannelButton.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/NewEventTool.java (96%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/NewLoopTool.java (96%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/PlayButton.java (95%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/PlayTool.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/ScoreView.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/ScoreViewListener.java (93%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/ScoreViewTool.java (96%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/ScoreViewToolbar.java (99%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/SelectChannelButton.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/SnapTool.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/score/ViewportTool.java (98%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/waveform/WaveformListener.java (93%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/waveform/WaveformRowView.java (97%)
 rename android/src/com/{google => levien}/synthesizer/android/widgets/waveform/WaveformView.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MessageInputProcessor.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MessageOutputProcessor.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiAdapter.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiChannelFilter.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiEvent.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiFile.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiFilePlayer.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiHeader.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiListener.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiListenerProxy.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiReader.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiTrack.java (96%)
 rename core/src/com/{google => levien}/synthesizer/core/midi/MidiUtil.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/model/CachedFrequencyProvider.java (97%)
 rename core/src/com/{google => levien}/synthesizer/core/model/CachedSignalProvider.java (97%)
 rename core/src/com/{google => levien}/synthesizer/core/model/Envelope.java (96%)
 rename core/src/com/{google => levien}/synthesizer/core/model/FrequencyProvider.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/model/SignalProvider.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/model/SynthesisTime.java (97%)
 rename core/src/com/{google => levien}/synthesizer/core/model/SynthesizerInput.java (97%)
 rename core/src/com/{google => levien}/synthesizer/core/model/WaveformInput.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/model/composite/MidiSynthesizer.java (91%)
 rename core/src/com/{google => levien}/synthesizer/core/model/composite/MultiChannelSynthesizer.java (90%)
 rename core/src/com/{google => levien}/synthesizer/core/model/composite/MultiTouchSynthesizer.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/model/composite/Presets.proto (97%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/AdsrEnvelope.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Amplifier.java (89%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Delay.java (93%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Echo.java (92%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Glide.java (90%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/LowPassFilter.java (87%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Mixer.java (91%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Tremolo.java (89%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/Tuner.java (85%)
 rename core/src/com/{google => levien}/synthesizer/core/model/modules/WaveformSelector.java (79%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/DrawbarOrgan.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/KarplusStrong.java (93%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Noise.java (84%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Oscillator.java (85%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Sawtooth.java (90%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Sine.java (91%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Square.java (86%)
 rename core/src/com/{google => levien}/synthesizer/core/model/oscillator/Triangle.java (86%)
 rename core/src/com/{google => levien}/synthesizer/core/music/EventComparator.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/music/Music.proto (97%)
 rename core/src/com/{google => levien}/synthesizer/core/music/Note.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/music/ScorePlayer.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/music/ScorePlayerListener.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Bag.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Generator.java (93%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Instrument.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Modulator.java (93%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/ModulatorSource.java (96%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Operator.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Preset.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Sample.java (96%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/SampleLink.java (96%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/SoundFontOscillator.java (95%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/SoundFontReader.java (98%)
 rename core/src/com/{google => levien}/synthesizer/core/soundfont/Zone.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/wave/RiffInputStream.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/wave/WaveAdapter.java (94%)
 rename core/src/com/{google => levien}/synthesizer/core/wave/WaveReader.java (99%)
 rename core/src/com/{google => levien}/synthesizer/core/wave/WaveWriter.java (99%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java (97%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/AmplifierTest.java (78%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/DelayTest.java (93%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/EchoTest.java (90%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/GlideTest.java (90%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/MixerTest.java (87%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/TremoloTest.java (95%)
 rename test/src/com/{google => levien}/synthesizer/core/model/modules/test/TunerTest.java (89%)
 rename test/src/com/{google => levien}/synthesizer/core/model/oscillator/test/OscillatorTest.java (81%)
 rename test/src/com/{google => levien}/synthesizer/core/model/oscillator/test/SawtoothTest.java (93%)
 rename test/src/com/{google => levien}/synthesizer/core/model/oscillator/test/SineTest.java (92%)
 rename test/src/com/{google => levien}/synthesizer/core/model/oscillator/test/SquareTest.java (92%)
 rename test/src/com/{google => levien}/synthesizer/core/model/oscillator/test/TriangleTest.java (93%)
 rename test/src/com/{google => levien}/synthesizer/core/model/test/CachedFrequencyProviderTest.java (92%)
 rename test/src/com/{google => levien}/synthesizer/core/model/test/CachedSignalProviderTest.java (91%)
 rename test/src/com/{google => levien}/synthesizer/core/model/test/SynthesisTimeTest.java (96%)
 rename test/src/com/{google => levien}/synthesizer/core/model/test/SynthesizerInputTest.java (94%)

diff --git a/android/.externalToolBuilders/NDK Builder.launch b/android/.externalToolBuilders/NDK Builder.launch
index 0f8f837..adee1ee 100644
--- a/android/.externalToolBuilders/NDK Builder.launch	
+++ b/android/.externalToolBuilders/NDK Builder.launch	
@@ -3,7 +3,7 @@
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/libs&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/jni&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_property:user.home}/install/android-ndk-r7b/ndk-build"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_property:user.home}/dl/android-ndk-r8d/ndk-build"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
diff --git a/android/.externalToolBuilders/Proto Builder.launch b/android/.externalToolBuilders/Proto Builder.launch
index ec9d4ed..18b99a6 100644
--- a/android/.externalToolBuilders/Proto Builder.launch	
+++ b/android/.externalToolBuilders/Proto Builder.launch	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/google/synthesizer/core/model/composite/Presets.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/google/synthesizer/core/model/sample/Proto.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/google/synthesizer/core/music/Music.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/levien/synthesizer/core/model/composite/Presets.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/levien/synthesizer/core/model/sample/Proto.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizer/core/com/levien/synthesizer/core/music/Music.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc}/../core/bin/protoc"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--java_out=../core/gen src/com/google/synthesizer/core/model/composite/Presets.proto src/com/google/synthesizer/core/music/Music.proto"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--java_out=../core/gen src/com/levien/synthesizer/core/model/composite/Presets.proto src/com/levien/synthesizer/core/music/Music.proto"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}/../core"/>
 </launchConfiguration>
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7110f1b..43c675a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.synthesizer"
+    package="com.levien.synthesizer"
     android:versionCode="2"
     android:versionName="0.9">
   <uses-sdk android:minSdkVersion="9" 
@@ -11,7 +11,7 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <application android:icon="@drawable/icon" android:label="@string/app_name">
     <activity
-        android:name=".android.ui.PianoActivity2"
+        android:name="com.levien.synthesizer.android.ui.PianoActivity2"
         android:label="@string/app_name"
         android:screenOrientation="landscape">
       <intent-filter>
@@ -25,51 +25,51 @@
           android:resource="@xml/device_filter" />
     </activity>
     <activity
-        android:name=".android.ui.MainActivity"
+        android:name="com.levien.synthesizer.android.ui.MainActivity"
         android:label="@string/app_name"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.ScoreActivity"
+        android:name="com.levien.synthesizer.android.ui.ScoreActivity"
         android:label="@string/app_name"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.ChordGridActivity"
+        android:name="com.levien.synthesizer.android.ui.ChordGridActivity"
         android:label="@string/chord_grid"
         android:screenOrientation="portrait" />
     <activity
-        android:name=".android.ui.InstrumentListActivity"
+        android:name="com.levien.synthesizer.android.ui.InstrumentListActivity"
         android:label="@string/instrument_list"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.EditInstrumentActivity"
+        android:name="com.levien.synthesizer.android.ui.EditInstrumentActivity"
         android:label="@string/edit_instrument"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.VibratoActivity"
+        android:name="com.levien.synthesizer.android.ui.VibratoActivity"
         android:label="@string/vibrato"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.OscillatorActivity"
+        android:name="com.levien.synthesizer.android.ui.OscillatorActivity"
         android:label="@string/oscillator"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.TremoloActivity"
+        android:name="com.levien.synthesizer.android.ui.TremoloActivity"
         android:label="@string/tremolo"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.LowPassFilterActivity"
+        android:name="com.levien.synthesizer.android.ui.LowPassFilterActivity"
         android:label="@string/low_pass_filter"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.AmplificationActivity"
+        android:name="com.levien.synthesizer.android.ui.AmplificationActivity"
         android:label="@string/amplification"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.EffectsActivity"
+        android:name="com.levien.synthesizer.android.ui.EffectsActivity"
         android:label="@string/effects"
         android:screenOrientation="landscape" />
     <activity
-        android:name=".android.ui.KarplusStrongActivity"
+        android:name="com.levien.synthesizer.android.ui.KarplusStrongActivity"
         android:label="@string/karplus_strong"
         android:screenOrientation="landscape" />
     <!-- Don't need the service if we're running native sound engine
diff --git a/android/res/layout/amplification.xml b/android/res/layout/amplification.xml
index a69f9f5..df08575 100644
--- a/android/res/layout/amplification.xml
+++ b/android/res/layout/amplification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,30 +34,30 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/attackKnob"
         app:value="0.0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/decayKnob"
         app:value="0.0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/sustainKnob"
         app:value="1.0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/releaseKnob"
         app:value="0.0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/emptyKnob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/volumeKnob"
         app:value="1.0"
         app:min="0.0"
@@ -69,7 +69,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -78,4 +78,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/chord_grid.xml b/android/res/layout/chord_grid.xml
index 74ae93c..4dee3b7 100644
--- a/android/res/layout/chord_grid.xml
+++ b/android/res/layout/chord_grid.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -22,11 +22,11 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.ChordGridView
+      <com.levien.synthesizer.android.widgets.ChordGridView
           android:id="@+id/chord_grid"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/effects.xml b/android/res/layout/effects.xml
index f7042ad..a656b1d 100644
--- a/android/res/layout/effects.xml
+++ b/android/res/layout/effects.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,28 +34,28 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/echoMixKnob"
         app:value="0.0"
         app:min="0.0"
         app:max="1.0"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/echoDelayKnob"
         app:value="0.5"
         app:min="0.1"
         app:max="2.0"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty1Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty2Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty3Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty4Knob"
         android:layout_margin="2px" />
   </TableRow>
@@ -64,7 +64,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -73,4 +73,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/karplus_strong.xml b/android/res/layout/karplus_strong.xml
index a906b2c..ece7846 100644
--- a/android/res/layout/karplus_strong.xml
+++ b/android/res/layout/karplus_strong.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,31 +34,31 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/blendKnob"
         app:value="0.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/stretchKnob"
         app:value="0.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/excitementKnob"
         app:value="0.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty1Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty2Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty3Knob"
         android:layout_margin="2px" />
   </TableRow>
@@ -67,7 +67,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -76,4 +76,4 @@
           app:first_octave="4" />
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/low_pass_filter.xml b/android/res/layout/low_pass_filter.xml
index 5bfe498..2bfc1cd 100644
--- a/android/res/layout/low_pass_filter.xml
+++ b/android/res/layout/low_pass_filter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,37 +34,37 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/cutoffKnob"
         app:value="1"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/depthKnob"
         app:value="0"
         app:min="-1"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/attackKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/decayKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/sustainKnob"
         app:value="1.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/releaseKnob"
         app:value="0.0"
         app:min="0"
@@ -76,7 +76,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -85,4 +85,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index e826559..ee89132 100644
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -33,7 +33,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -42,4 +42,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/oscillator.xml b/android/res/layout/oscillator.xml
index 933ed9e..d782b53 100644
--- a/android/res/layout/oscillator.xml
+++ b/android/res/layout/oscillator.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,34 +34,34 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/glideKnob"
         app:value="0.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/coarseKnob"
         app:value="0.0"
         app:min="-1.0"
         app:max="1.0"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/fineKnob"
         app:value="0.0"
         app:min="-0.0833333333"
         app:max="0.0833333333"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/vibratoDepthKnob"
         app:value="0"
         app:min="0"
         app:max="0.1666666667"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/empty1Knob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/balanceKnob"
         app:value="0"
         app:min="0"
@@ -73,12 +73,12 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.waveform.WaveformRowView
+      <com.levien.synthesizer.android.widgets.waveform.WaveformRowView
           android:id="@+id/waveform"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1" />
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -87,4 +87,4 @@
           app:first_octave="4" />
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/piano.xml b/android/res/layout/piano.xml
index 009bdb5..043d7e9 100644
--- a/android/res/layout/piano.xml
+++ b/android/res/layout/piano.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,7 +34,7 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/volumeKnob"
         app:value="0.0"
         app:min="0"
@@ -51,7 +51,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -60,4 +60,4 @@
           app:first_octave="4" />
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/piano2.xml b/android/res/layout/piano2.xml
index fe71d67..83e7b4a 100644
--- a/android/res/layout/piano2.xml
+++ b/android/res/layout/piano2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -10,10 +10,12 @@
   <TableRow>
     <TextView
         android:text="@string/cutoff"
+        android:width="30sp"
         android:id="@+id/cutoffLabel"
         android:gravity="center_horizontal" />
     <TextView
         android:text="@+string/resonance"
+        android:width="30sp"
         android:id="@+id/resonanceLabel"
         android:gravity="center_horizontal" />
     <TextView
@@ -30,13 +32,13 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/cutoffKnob"
         app:value="1.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2dp" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/resonanceKnob"
         app:value="0.0"
         app:min="0"
@@ -52,10 +54,12 @@
         />
       <TextView
           android:id="@+id/status"
+          android:visibility="invisible"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
       />
       <Button
+          android:visibility="invisible"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:id="@+id/capture"
@@ -74,7 +78,7 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/android/res/layout/score.xml b/android/res/layout/score.xml
index a83c40d..a3ff218 100644
--- a/android/res/layout/score.xml
+++ b/android/res/layout/score.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -12,18 +12,18 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.score.ScoreView
+      <com.levien.synthesizer.android.widgets.score.ScoreView
           android:id="@+id/score"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1"
           app:octaves="2"
           app:first_octave="4" />
-      <com.google.synthesizer.android.widgets.score.ScoreViewToolbar
+      <com.levien.synthesizer.android.widgets.score.ScoreViewToolbar
           android:id="@+id/toolbar"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1" />
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/tremolo.xml b/android/res/layout/tremolo.xml
index b9326e4..8d5e660 100644
--- a/android/res/layout/tremolo.xml
+++ b/android/res/layout/tremolo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,37 +34,37 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/rateKnob"
         app:value="0"
         app:min="0"
         app:max="10"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/depthKnob"
         app:value="0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/attackKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/decayKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/sustainKnob"
         app:value="1.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/releaseKnob"
         app:value="0.0"
         app:min="0"
@@ -76,12 +76,12 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.waveform.WaveformRowView
+      <com.levien.synthesizer.android.widgets.waveform.WaveformRowView
           android:id="@+id/waveform"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1"/>
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -90,4 +90,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/res/layout/vibrato.xml b/android/res/layout/vibrato.xml
index c8bfc5a..34e22a0 100644
--- a/android/res/layout/vibrato.xml
+++ b/android/res/layout/vibrato.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.google.synthesizer"
+    xmlns:app="http://schemas.android.com/apk/res/com.levien.synthesizer"
     android:id="@+id/TableLayout01"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,34 +34,34 @@
         android:gravity="center_horizontal" />
   </TableRow>
   <TableRow>
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/rateKnob"
         app:value="0.0"
         app:min="0"
         app:max="10"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobPlaceholderView
+    <com.levien.synthesizer.android.widgets.knob.KnobPlaceholderView
         android:id="@+id/depthKnob"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/attackKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/decayKnob"
         app:value="0.0"
         app:min="0"
         app:max="5"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/sustainKnob"
         app:value="1.0"
         app:min="0"
         app:max="1"
         android:layout_margin="2px" />
-    <com.google.synthesizer.android.widgets.knob.KnobView
+    <com.levien.synthesizer.android.widgets.knob.KnobView
         android:id="@+id/releaseKnob"
         app:value="0.0"
         app:min="0"
@@ -73,12 +73,12 @@
         android:layout_height="fill_parent"
         android:layout_span="6"
         android:orientation="vertical">
-      <com.google.synthesizer.android.widgets.waveform.WaveformRowView
+      <com.levien.synthesizer.android.widgets.waveform.WaveformRowView
           android:id="@+id/waveform"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1"/>
-      <com.google.synthesizer.android.widgets.piano.PianoView
+      <com.levien.synthesizer.android.widgets.piano.PianoView
           android:id="@+id/piano"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
@@ -87,4 +87,4 @@
           app:first_octave="4"/>
     </LinearLayout>
   </TableRow>
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/android/src/com/google/synthesizer/android/AndroidGlue.java b/android/src/com/levien/synthesizer/android/AndroidGlue.java
similarity index 92%
rename from android/src/com/google/synthesizer/android/AndroidGlue.java
rename to android/src/com/levien/synthesizer/android/AndroidGlue.java
index 4d78f2a..7405e01 100644
--- a/android/src/com/google/synthesizer/android/AndroidGlue.java
+++ b/android/src/com/levien/synthesizer/android/AndroidGlue.java
@@ -1,6 +1,6 @@
-package com.google.synthesizer.android;
+package com.levien.synthesizer.android;
 
-import com.google.synthesizer.core.midi.MessageOutputProcessor;
+import com.levien.synthesizer.core.midi.MessageOutputProcessor;
 
 /**
  * JNI container for connecting to C++ synth engine. The actual implementation is in the cpp/src
diff --git a/android/src/com/google/synthesizer/android/Storage.java b/android/src/com/levien/synthesizer/android/Storage.java
similarity index 99%
rename from android/src/com/google/synthesizer/android/Storage.java
rename to android/src/com/levien/synthesizer/android/Storage.java
index 1062c0a..de4cf81 100644
--- a/android/src/com/google/synthesizer/android/Storage.java
+++ b/android/src/com/levien/synthesizer/android/Storage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android;
+package com.levien.synthesizer.android;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,7 +31,7 @@ import android.os.Environment;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.google.synthesizer.core.music.Music.Score;
+import com.levien.synthesizer.core.music.Music.Score;
 
 /**
  * A collection of functions for storing and retrieving scores.
diff --git a/android/src/com/google/synthesizer/android/service/SynthesizerService.java b/android/src/com/levien/synthesizer/android/service/SynthesizerService.java
similarity index 95%
rename from android/src/com/google/synthesizer/android/service/SynthesizerService.java
rename to android/src/com/levien/synthesizer/android/service/SynthesizerService.java
index d80b4da..99ab4a2 100755
--- a/android/src/com/google/synthesizer/android/service/SynthesizerService.java
+++ b/android/src/com/levien/synthesizer/android/service/SynthesizerService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.service;
+package com.levien.synthesizer.android.service;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,9 +29,9 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.soundfont.SoundFontReader;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.soundfont.SoundFontReader;
 
 /**
  * An Android Service that plays audio from a synthesizer.
diff --git a/android/src/com/google/synthesizer/android/service/SynthesizerThread.java b/android/src/com/levien/synthesizer/android/service/SynthesizerThread.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/service/SynthesizerThread.java
rename to android/src/com/levien/synthesizer/android/service/SynthesizerThread.java
index e7cd676..ca1e816 100755
--- a/android/src/com/google/synthesizer/android/service/SynthesizerThread.java
+++ b/android/src/com/levien/synthesizer/android/service/SynthesizerThread.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.service;
+package com.levien.synthesizer.android.service;
 
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.util.Log;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
 
 /**
  * SynthesizerThread is a thread-safe interface to a thread that constantly plays sampled audio data
diff --git a/android/src/com/google/synthesizer/android/stats/JitterStats.java b/android/src/com/levien/synthesizer/android/stats/JitterStats.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/stats/JitterStats.java
rename to android/src/com/levien/synthesizer/android/stats/JitterStats.java
index abc743d..7e75c66 100644
--- a/android/src/com/google/synthesizer/android/stats/JitterStats.java
+++ b/android/src/com/levien/synthesizer/android/stats/JitterStats.java
@@ -1,4 +1,4 @@
-package com.google.synthesizer.android.stats;
+package com.levien.synthesizer.android.stats;
 
 import android.util.Log;
 
diff --git a/android/src/com/google/synthesizer/android/ui/AmplificationActivity.java b/android/src/com/levien/synthesizer/android/ui/AmplificationActivity.java
similarity index 85%
rename from android/src/com/google/synthesizer/android/ui/AmplificationActivity.java
rename to android/src/com/levien/synthesizer/android/ui/AmplificationActivity.java
index a141427..f7ccd9e 100644
--- a/android/src/com/google/synthesizer/android/ui/AmplificationActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/AmplificationActivity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for modifying amplification/adsr envelope.
diff --git a/android/src/com/google/synthesizer/android/ui/ChordGridActivity.java b/android/src/com/levien/synthesizer/android/ui/ChordGridActivity.java
similarity index 91%
rename from android/src/com/google/synthesizer/android/ui/ChordGridActivity.java
rename to android/src/com/levien/synthesizer/android/ui/ChordGridActivity.java
index c065e44..d9195c6 100644
--- a/android/src/com/google/synthesizer/android/ui/ChordGridActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/ChordGridActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.util.ArrayList;
 
@@ -25,9 +25,9 @@ import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.ChordGridView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.android.widgets.ChordGridView;
 
 /**
  * Activity for playing whole chords at a time, arranged in a circle of fifths.
diff --git a/android/src/com/google/synthesizer/android/ui/EditInstrumentActivity.java b/android/src/com/levien/synthesizer/android/ui/EditInstrumentActivity.java
similarity index 95%
rename from android/src/com/google/synthesizer/android/ui/EditInstrumentActivity.java
rename to android/src/com/levien/synthesizer/android/ui/EditInstrumentActivity.java
index 0e9ae85..cc4a8e2 100644
--- a/android/src/com/google/synthesizer/android/ui/EditInstrumentActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/EditInstrumentActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.app.ListActivity;
 import android.content.ComponentName;
@@ -27,9 +27,9 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.service.SynthesizerService;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.service.SynthesizerService;
 
 /**
  * An Activity to let the user choose a subset of a presets settings in order to edit them.
diff --git a/android/src/com/google/synthesizer/android/ui/EffectsActivity.java b/android/src/com/levien/synthesizer/android/ui/EffectsActivity.java
similarity index 82%
rename from android/src/com/google/synthesizer/android/ui/EffectsActivity.java
rename to android/src/com/levien/synthesizer/android/ui/EffectsActivity.java
index ed42c12..6d0c17f 100644
--- a/android/src/com/google/synthesizer/android/ui/EffectsActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/EffectsActivity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for modifying effects like echo.
diff --git a/android/src/com/google/synthesizer/android/ui/InstrumentListActivity.java b/android/src/com/levien/synthesizer/android/ui/InstrumentListActivity.java
similarity index 93%
rename from android/src/com/google/synthesizer/android/ui/InstrumentListActivity.java
rename to android/src/com/levien/synthesizer/android/ui/InstrumentListActivity.java
index 4fd5e39..1941c95 100644
--- a/android/src/com/google/synthesizer/android/ui/InstrumentListActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/InstrumentListActivity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.util.ArrayList;
 
-import com.google.synthesizer.android.service.SynthesizerService;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.android.service.SynthesizerService;
 
 import android.app.ListActivity;
 import android.content.ComponentName;
diff --git a/android/src/com/google/synthesizer/android/ui/KarplusStrongActivity.java b/android/src/com/levien/synthesizer/android/ui/KarplusStrongActivity.java
similarity index 84%
rename from android/src/com/google/synthesizer/android/ui/KarplusStrongActivity.java
rename to android/src/com/levien/synthesizer/android/ui/KarplusStrongActivity.java
index b3f4262..0ba5ee8 100644
--- a/android/src/com/google/synthesizer/android/ui/KarplusStrongActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/KarplusStrongActivity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for modifying Karplus-Strong parameters.
diff --git a/android/src/com/google/synthesizer/android/ui/LowPassFilterActivity.java b/android/src/com/levien/synthesizer/android/ui/LowPassFilterActivity.java
similarity index 87%
rename from android/src/com/google/synthesizer/android/ui/LowPassFilterActivity.java
rename to android/src/com/levien/synthesizer/android/ui/LowPassFilterActivity.java
index f334005..d517c0b 100644
--- a/android/src/com/google/synthesizer/android/ui/LowPassFilterActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/LowPassFilterActivity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for modifying low-pass filter settings.
diff --git a/android/src/com/google/synthesizer/android/ui/MainActivity.java b/android/src/com/levien/synthesizer/android/ui/MainActivity.java
similarity index 94%
rename from android/src/com/google/synthesizer/android/ui/MainActivity.java
rename to android/src/com/levien/synthesizer/android/ui/MainActivity.java
index a4fef17..caf802f 100644
--- a/android/src/com/google/synthesizer/android/ui/MainActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/MainActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.util.ArrayList;
 
@@ -27,9 +27,9 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 // TODO(klimt): Add the ability to switch channels.
 
diff --git a/android/src/com/google/synthesizer/android/ui/OscillatorActivity.java b/android/src/com/levien/synthesizer/android/ui/OscillatorActivity.java
similarity index 84%
rename from android/src/com/google/synthesizer/android/ui/OscillatorActivity.java
rename to android/src/com/levien/synthesizer/android/ui/OscillatorActivity.java
index 732d5dd..57eb91f 100644
--- a/android/src/com/google/synthesizer/android/ui/OscillatorActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/OscillatorActivity.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.android.widgets.waveform.WaveformRowView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
+import com.levien.synthesizer.android.widgets.waveform.WaveformRowView;
 
 /**
  * Activity for modifying oscillator parameters.
diff --git a/android/src/com/google/synthesizer/android/ui/PianoActivity.java b/android/src/com/levien/synthesizer/android/ui/PianoActivity.java
similarity index 88%
rename from android/src/com/google/synthesizer/android/ui/PianoActivity.java
rename to android/src/com/levien/synthesizer/android/ui/PianoActivity.java
index 698cf59..2bc6bef 100644
--- a/android/src/com/google/synthesizer/android/ui/PianoActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/PianoActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.util.ArrayList;
 
@@ -25,11 +25,11 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.AdapterView.OnItemSelectedListener;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for simply playing the piano.
diff --git a/android/src/com/google/synthesizer/android/ui/PianoActivity2.java b/android/src/com/levien/synthesizer/android/ui/PianoActivity2.java
similarity index 95%
rename from android/src/com/google/synthesizer/android/ui/PianoActivity2.java
rename to android/src/com/levien/synthesizer/android/ui/PianoActivity2.java
index 01c79aa..1a9b09d 100644
--- a/android/src/com/google/synthesizer/android/ui/PianoActivity2.java
+++ b/android/src/com/levien/synthesizer/android/ui/PianoActivity2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,9 +35,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.view.Menu;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.View.OnClickListener;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
@@ -45,12 +46,12 @@ import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.AndroidGlue;
-import com.google.synthesizer.android.stats.JitterStats;
-import com.google.synthesizer.android.widgets.knob.KnobListener;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.android.AndroidGlue;
+import com.levien.synthesizer.android.stats.JitterStats;
+import com.levien.synthesizer.android.widgets.knob.KnobListener;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
 
 /**
  * Activity for simply playing the piano.
@@ -70,14 +71,12 @@ public class PianoActivity2 extends Activity {
     resonanceKnob_ = (KnobView)findViewById(R.id.resonanceKnob);
     presetSpinner_ = (Spinner)findViewById(R.id.presetSpinner);
 
-    AudioParams params = new AudioParams(44100, 384);
+    AudioParams params = new AudioParams(44100, 64);
     // TODO: for pre-JB-MR1 devices, do some matching against known devices to
     // get best audio parameters.
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
       getJbMr1Params(params);
     }
-    //params.sampleRate = 44100;
-    //params.bufferSize = 976;
 
     androidGlue_ = new AndroidGlue();
     androidGlue_.start(params.sampleRate, params.bufferSize);
diff --git a/android/src/com/google/synthesizer/android/ui/ScoreActivity.java b/android/src/com/levien/synthesizer/android/ui/ScoreActivity.java
similarity index 91%
rename from android/src/com/google/synthesizer/android/ui/ScoreActivity.java
rename to android/src/com/levien/synthesizer/android/ui/ScoreActivity.java
index c33dc95..7552cd8 100644
--- a/android/src/com/google/synthesizer/android/ui/ScoreActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/ScoreActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -28,12 +28,12 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.Storage;
-import com.google.synthesizer.android.widgets.score.ScoreView;
-import com.google.synthesizer.android.widgets.score.ScoreViewToolbar;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.music.Music.Score.Builder;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.music.Music.Score.Builder;
+import com.levien.synthesizer.android.Storage;
+import com.levien.synthesizer.android.widgets.score.ScoreView;
+import com.levien.synthesizer.android.widgets.score.ScoreViewToolbar;
 
 /**
  * An Activity for editing or playing a score.
diff --git a/android/src/com/google/synthesizer/android/ui/SynthesizerActivity.java b/android/src/com/levien/synthesizer/android/ui/SynthesizerActivity.java
similarity index 94%
rename from android/src/com/google/synthesizer/android/ui/SynthesizerActivity.java
rename to android/src/com/levien/synthesizer/android/ui/SynthesizerActivity.java
index a11c7b0..06d96eb 100644
--- a/android/src/com/google/synthesizer/android/ui/SynthesizerActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/SynthesizerActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -27,10 +27,10 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.service.SynthesizerService;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.service.SynthesizerService;
 
 /**
  * A base class for any Android Activity that wants to interact with the SynthesizerService.
@@ -46,7 +46,7 @@ public abstract class SynthesizerActivity extends Activity {
    * @param path - The absolute path of the component.
    */
   public static Uri makeUri(int channel, Setting... settings) {
-    StringBuilder uri = new StringBuilder("content://com.google.synthesizer/" + channel + "/");
+    StringBuilder uri = new StringBuilder("content://com.levien.synthesizer/" + channel + "/");
     boolean first = true;
     for (Setting setting : settings) {
       if (!first) {
diff --git a/android/src/com/google/synthesizer/android/ui/TremoloActivity.java b/android/src/com/levien/synthesizer/android/ui/TremoloActivity.java
similarity index 85%
rename from android/src/com/google/synthesizer/android/ui/TremoloActivity.java
rename to android/src/com/levien/synthesizer/android/ui/TremoloActivity.java
index 433e22c..d5a0060 100644
--- a/android/src/com/google/synthesizer/android/ui/TremoloActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/TremoloActivity.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.android.widgets.waveform.WaveformRowView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
+import com.levien.synthesizer.android.widgets.waveform.WaveformRowView;
 
 /**
  * Activity for modifying tremolo.
diff --git a/android/src/com/google/synthesizer/android/ui/VibratoActivity.java b/android/src/com/levien/synthesizer/android/ui/VibratoActivity.java
similarity index 84%
rename from android/src/com/google/synthesizer/android/ui/VibratoActivity.java
rename to android/src/com/levien/synthesizer/android/ui/VibratoActivity.java
index 329b033..6c48e50 100644
--- a/android/src/com/google/synthesizer/android/ui/VibratoActivity.java
+++ b/android/src/com/levien/synthesizer/android/ui/VibratoActivity.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.ui;
+package com.levien.synthesizer.android.ui;
 
 import android.os.Bundle;
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.knob.KnobView;
-import com.google.synthesizer.android.widgets.piano.PianoView;
-import com.google.synthesizer.android.widgets.waveform.WaveformRowView;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.android.widgets.knob.KnobView;
+import com.levien.synthesizer.android.widgets.piano.PianoView;
+import com.levien.synthesizer.android.widgets.waveform.WaveformRowView;
 
 /**
  * Activity for modifying vibrato.
diff --git a/android/src/com/google/synthesizer/android/widgets/ChordGridView.java b/android/src/com/levien/synthesizer/android/widgets/ChordGridView.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/ChordGridView.java
rename to android/src/com/levien/synthesizer/android/widgets/ChordGridView.java
index 4bab024..067893d 100644
--- a/android/src/com/google/synthesizer/android/widgets/ChordGridView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/ChordGridView.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets;
+package com.levien.synthesizer.android.widgets;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.android.widgets.piano.PianoViewListener;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.music.Note;
+import com.levien.synthesizer.android.widgets.piano.PianoViewListener;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/android/src/com/google/synthesizer/android/widgets/knob/KnobListener.java b/android/src/com/levien/synthesizer/android/widgets/knob/KnobListener.java
similarity index 93%
rename from android/src/com/google/synthesizer/android/widgets/knob/KnobListener.java
rename to android/src/com/levien/synthesizer/android/widgets/knob/KnobListener.java
index f9e3ed4..1503325 100644
--- a/android/src/com/google/synthesizer/android/widgets/knob/KnobListener.java
+++ b/android/src/com/levien/synthesizer/android/widgets/knob/KnobListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.knob;
+package com.levien.synthesizer.android.widgets.knob;
 
 /**
  * KnobListener is an interface for getting events when a KnobView's value changes.
diff --git a/android/src/com/google/synthesizer/android/widgets/knob/KnobPlaceholderView.java b/android/src/com/levien/synthesizer/android/widgets/knob/KnobPlaceholderView.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/knob/KnobPlaceholderView.java
rename to android/src/com/levien/synthesizer/android/widgets/knob/KnobPlaceholderView.java
index 43fc679..3d9be6a 100644
--- a/android/src/com/google/synthesizer/android/widgets/knob/KnobPlaceholderView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/knob/KnobPlaceholderView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.knob;
+package com.levien.synthesizer.android.widgets.knob;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/android/src/com/google/synthesizer/android/widgets/knob/KnobView.java b/android/src/com/levien/synthesizer/android/widgets/knob/KnobView.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/knob/KnobView.java
rename to android/src/com/levien/synthesizer/android/widgets/knob/KnobView.java
index 60f31a9..7971a12 100644
--- a/android/src/com/google/synthesizer/android/widgets/knob/KnobView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/knob/KnobView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.knob;
+package com.levien.synthesizer.android.widgets.knob;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -34,10 +34,10 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
 
 /**
  * KnobView is a widget for setting a real value by turning a virtual "knob".
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/BlackPianoKey.java b/android/src/com/levien/synthesizer/android/widgets/piano/BlackPianoKey.java
similarity index 96%
rename from android/src/com/google/synthesizer/android/widgets/piano/BlackPianoKey.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/BlackPianoKey.java
index dc8f614..d88da27 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/BlackPianoKey.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/BlackPianoKey.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
 
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.music.Note;
 
 /**
  * One of the black (non-natural) keys on the piano.
@@ -92,4 +92,4 @@ public class BlackPianoKey extends NotePianoKey {
   protected static int getBlackKeyHeight(Rect drawingRect) {
     return getWhiteKeyHeight(drawingRect) / 2;
   }
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/NotePianoKey.java b/android/src/com/levien/synthesizer/android/widgets/piano/NotePianoKey.java
similarity index 96%
rename from android/src/com/google/synthesizer/android/widgets/piano/NotePianoKey.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/NotePianoKey.java
index c910bcb..4980458 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/NotePianoKey.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/NotePianoKey.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 
 /**
@@ -49,4 +49,4 @@ public abstract class NotePianoKey extends PianoKey {
 
   // Offset of the key from the start of the octave.
   protected int key_;
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/OctavePianoKey.java b/android/src/com/levien/synthesizer/android/widgets/piano/OctavePianoKey.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/piano/OctavePianoKey.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/OctavePianoKey.java
index b62f538..fe8c31c 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/OctavePianoKey.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/OctavePianoKey.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 
 import android.graphics.Canvas;
@@ -108,4 +108,4 @@ public class OctavePianoKey extends PianoKey {
 
   // How the octave should change when this key is pressed.  
   private int delta_;
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/PianoKey.java b/android/src/com/levien/synthesizer/android/widgets/piano/PianoKey.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/piano/PianoKey.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/PianoKey.java
index 7a2a892..d1f114f 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/PianoKey.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/PianoKey.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -22,7 +22,7 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.util.Log;
 
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.music.Note;
 
 /**
  * PianoKey is the abstract base class for any key on the piano.
@@ -174,4 +174,4 @@ public abstract class PianoKey {
       Note.C, Note.D, Note.E, Note.F, Note.G, Note.A, Note.B };
   protected static final int BLACK_KEYS[] = {
       Note.C_SHARP, Note.E_FLAT, Note.NONE, Note.F_SHARP, Note.A_FLAT, Note.B_FLAT, Note.NONE };
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/PianoView.java b/android/src/com/levien/synthesizer/android/widgets/piano/PianoView.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/piano/PianoView.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/PianoView.java
index d68003f..6dd2884 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/PianoView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/PianoView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,10 +27,10 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.midi.MidiListener;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.midi.MidiListener;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.music.Note;
 
 /**
  * PianoView is a UI widget that simulates a music keyboard.
@@ -165,6 +165,9 @@ public class PianoView extends View {
         redraw |= keys_[i].onTouchUp(finger);
       }
     }
+    if (!usePressure_) {
+      pressure = 0.5f;
+    }
     if (keyDown instanceof NotePianoKey) {
       notifyNoteDown(((NotePianoKey)keyDown).getLogFrequency(), finger, true, pressure);
     }
@@ -413,5 +416,5 @@ public class PianoView extends View {
   protected static final int FINGERS = 5;
   
   // Whether to use pressure (doesn't work well on all hardware)
-  private boolean usePressure_ = true;
+  private boolean usePressure_ = false;
 }
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/PianoViewListener.java b/android/src/com/levien/synthesizer/android/widgets/piano/PianoViewListener.java
similarity index 94%
rename from android/src/com/google/synthesizer/android/widgets/piano/PianoViewListener.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/PianoViewListener.java
index 5c7a087..258f422 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/PianoViewListener.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/PianoViewListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 // Simple interface for listening to piano widget events.
 public interface PianoViewListener {
@@ -29,4 +29,4 @@ public interface PianoViewListener {
    * The note was released.
    */
   void noteUp(int finger);
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/piano/WhitePianoKey.java b/android/src/com/levien/synthesizer/android/widgets/piano/WhitePianoKey.java
similarity index 95%
rename from android/src/com/google/synthesizer/android/widgets/piano/WhitePianoKey.java
rename to android/src/com/levien/synthesizer/android/widgets/piano/WhitePianoKey.java
index e8b444e..4ab7909 100644
--- a/android/src/com/google/synthesizer/android/widgets/piano/WhitePianoKey.java
+++ b/android/src/com/levien/synthesizer/android/widgets/piano/WhitePianoKey.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.piano;
+package com.levien.synthesizer.android.widgets.piano;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
 
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.music.Note;
 
 /**
  * A white key on the piano.
@@ -69,4 +69,4 @@ public class WhitePianoKey extends NotePianoKey {
     canvas.drawRect(rect_, fillPaint_);
     canvas.drawRect(rect_, strokePaint_);
   }
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/score/EditEventTool.java b/android/src/com/levien/synthesizer/android/widgets/score/EditEventTool.java
similarity index 99%
rename from android/src/com/google/synthesizer/android/widgets/score/EditEventTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/EditEventTool.java
index db376ec..b3ea9e4 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/EditEventTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/EditEventTool.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.music.Music.Event;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/HideChannelButton.java b/android/src/com/levien/synthesizer/android/widgets/score/HideChannelButton.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/score/HideChannelButton.java
rename to android/src/com/levien/synthesizer/android/widgets/score/HideChannelButton.java
index 0db58ea..b8bd815 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/HideChannelButton.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/HideChannelButton.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
+import com.levien.synthesizer.R;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/NewEventTool.java b/android/src/com/levien/synthesizer/android/widgets/score/NewEventTool.java
similarity index 96%
rename from android/src/com/google/synthesizer/android/widgets/score/NewEventTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/NewEventTool.java
index f28a565..3179a23 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/NewEventTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/NewEventTool.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.music.Music.Event;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/NewLoopTool.java b/android/src/com/levien/synthesizer/android/widgets/score/NewLoopTool.java
similarity index 96%
rename from android/src/com/google/synthesizer/android/widgets/score/NewLoopTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/NewLoopTool.java
index e4bfd4c..9df4e91 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/NewLoopTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/NewLoopTool.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.music.Music.Event;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/PlayButton.java b/android/src/com/levien/synthesizer/android/widgets/score/PlayButton.java
similarity index 95%
rename from android/src/com/google/synthesizer/android/widgets/score/PlayButton.java
rename to android/src/com/levien/synthesizer/android/widgets/score/PlayButton.java
index fbbc48b..594aa3c 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/PlayButton.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/PlayButton.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.music.ScorePlayer;
-import com.google.synthesizer.core.music.ScorePlayerListener;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.music.ScorePlayer;
+import com.levien.synthesizer.core.music.ScorePlayerListener;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/PlayTool.java b/android/src/com/levien/synthesizer/android/widgets/score/PlayTool.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/score/PlayTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/PlayTool.java
index d237bfa..9bddec3 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/PlayTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/PlayTool.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.music.Note;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/ScoreView.java b/android/src/com/levien/synthesizer/android/widgets/score/ScoreView.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/score/ScoreView.java
rename to android/src/com/levien/synthesizer/android/widgets/score/ScoreView.java
index d0cf967..e5c055c 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/ScoreView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/ScoreView.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.music.Music.Event;
-import com.google.synthesizer.core.music.Music.Score;
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.R;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.core.music.Music.Score;
+import com.levien.synthesizer.core.music.Note;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewListener.java b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewListener.java
similarity index 93%
rename from android/src/com/google/synthesizer/android/widgets/score/ScoreViewListener.java
rename to android/src/com/levien/synthesizer/android/widgets/score/ScoreViewListener.java
index 7900b54..2dd5349 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewListener.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 /**
  * A listener for events happening in a ScoreView.
diff --git a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewTool.java b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewTool.java
similarity index 96%
rename from android/src/com/google/synthesizer/android/widgets/score/ScoreViewTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/ScoreViewTool.java
index f7a7f24..5f5efb0 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewTool.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
-import com.google.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.core.music.Music.Event;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
diff --git a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewToolbar.java b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewToolbar.java
similarity index 99%
rename from android/src/com/google/synthesizer/android/widgets/score/ScoreViewToolbar.java
rename to android/src/com/levien/synthesizer/android/widgets/score/ScoreViewToolbar.java
index f24d00c..2d97e51 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/ScoreViewToolbar.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/ScoreViewToolbar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -219,4 +219,4 @@ public class ScoreViewToolbar extends View implements ScoreViewListener {
 
   // The rect that each tool occupied the last time it was drawn.
   private Rect[] toolRect_;
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/score/SelectChannelButton.java b/android/src/com/levien/synthesizer/android/widgets/score/SelectChannelButton.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/score/SelectChannelButton.java
rename to android/src/com/levien/synthesizer/android/widgets/score/SelectChannelButton.java
index 20d961f..4e653f2 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/SelectChannelButton.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/SelectChannelButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
diff --git a/android/src/com/google/synthesizer/android/widgets/score/SnapTool.java b/android/src/com/levien/synthesizer/android/widgets/score/SnapTool.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/score/SnapTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/SnapTool.java
index 36df185..3805df6 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/SnapTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/SnapTool.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
-import com.google.synthesizer.R;
+import com.levien.synthesizer.R;
 
 import java.util.logging.Logger;
 
diff --git a/android/src/com/google/synthesizer/android/widgets/score/ViewportTool.java b/android/src/com/levien/synthesizer/android/widgets/score/ViewportTool.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/score/ViewportTool.java
rename to android/src/com/levien/synthesizer/android/widgets/score/ViewportTool.java
index a8639ec..19b16f4 100644
--- a/android/src/com/google/synthesizer/android/widgets/score/ViewportTool.java
+++ b/android/src/com/levien/synthesizer/android/widgets/score/ViewportTool.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.score;
+package com.levien.synthesizer.android.widgets.score;
 
 import java.util.logging.Logger;
 
-import com.google.synthesizer.R;
+import com.levien.synthesizer.R;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformListener.java b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformListener.java
similarity index 93%
rename from android/src/com/google/synthesizer/android/widgets/waveform/WaveformListener.java
rename to android/src/com/levien/synthesizer/android/widgets/waveform/WaveformListener.java
index fdcb433..d8b9ebb 100644
--- a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformListener.java
+++ b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.waveform;
+package com.levien.synthesizer.android.widgets.waveform;
 
 /**
  * WaveformListener is an interface for getting events when a WaveformView's value changes.
diff --git a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformRowView.java b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformRowView.java
similarity index 97%
rename from android/src/com/google/synthesizer/android/widgets/waveform/WaveformRowView.java
rename to android/src/com/levien/synthesizer/android/widgets/waveform/WaveformRowView.java
index 7fdfb27..cd3b5a0 100644
--- a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformRowView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformRowView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.waveform;
+package com.levien.synthesizer.android.widgets.waveform;
 
-import com.google.synthesizer.core.model.WaveformInput;
+import com.levien.synthesizer.core.model.WaveformInput;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -164,4 +164,4 @@ public class WaveformRowView extends WaveformView {
 
     setMeasuredDimension(width, height);
   }
-}
\ No newline at end of file
+}
diff --git a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformView.java b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformView.java
similarity index 98%
rename from android/src/com/google/synthesizer/android/widgets/waveform/WaveformView.java
rename to android/src/com/levien/synthesizer/android/widgets/waveform/WaveformView.java
index b267833..430c14c 100644
--- a/android/src/com/google/synthesizer/android/widgets/waveform/WaveformView.java
+++ b/android/src/com/levien/synthesizer/android/widgets/waveform/WaveformView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.android.widgets.waveform;
+package com.levien.synthesizer.android.widgets.waveform;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -26,9 +26,9 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import com.google.synthesizer.core.model.WaveformInput;
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.core.model.WaveformInput;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
 
 /**
  * WaveformView is a control for selecting from among available waveforms.
@@ -467,4 +467,4 @@ public class WaveformView extends View {
 
   // Object listening for events when the knob's value changes.
   private WaveformListener listener_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/midi/MessageInputProcessor.java b/core/src/com/levien/synthesizer/core/midi/MessageInputProcessor.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/midi/MessageInputProcessor.java
rename to core/src/com/levien/synthesizer/core/midi/MessageInputProcessor.java
index 6deb462..e6892fa 100644
--- a/core/src/com/google/synthesizer/core/midi/MessageInputProcessor.java
+++ b/core/src/com/levien/synthesizer/core/midi/MessageInputProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/com/google/synthesizer/core/midi/MessageOutputProcessor.java b/core/src/com/levien/synthesizer/core/midi/MessageOutputProcessor.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/midi/MessageOutputProcessor.java
rename to core/src/com/levien/synthesizer/core/midi/MessageOutputProcessor.java
index ba63a4b..0e7ad6d 100644
--- a/core/src/com/google/synthesizer/core/midi/MessageOutputProcessor.java
+++ b/core/src/com/levien/synthesizer/core/midi/MessageOutputProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/core/src/com/google/synthesizer/core/midi/MidiAdapter.java b/core/src/com/levien/synthesizer/core/midi/MidiAdapter.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiAdapter.java
rename to core/src/com/levien/synthesizer/core/midi/MidiAdapter.java
index c2dc1dd..76d68c3 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiAdapter.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 /**
  * An implementation of MidiListener with stub implementations so that clients don't have to handle
diff --git a/core/src/com/google/synthesizer/core/midi/MidiChannelFilter.java b/core/src/com/levien/synthesizer/core/midi/MidiChannelFilter.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiChannelFilter.java
rename to core/src/com/levien/synthesizer/core/midi/MidiChannelFilter.java
index 98e1b06..a94785d 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiChannelFilter.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiChannelFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 /**
  * A MidiChannelFilter is like a MidiListenerProxy, but only passes messages for a given channel.
diff --git a/core/src/com/google/synthesizer/core/midi/MidiEvent.java b/core/src/com/levien/synthesizer/core/midi/MidiEvent.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiEvent.java
rename to core/src/com/levien/synthesizer/core/midi/MidiEvent.java
index 400c4d0..8861a2b 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiEvent.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiEvent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 /**
  * A MidiEvent is the combination of a midi message and a time offset.  The message is represented
diff --git a/core/src/com/google/synthesizer/core/midi/MidiFile.java b/core/src/com/levien/synthesizer/core/midi/MidiFile.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiFile.java
rename to core/src/com/levien/synthesizer/core/midi/MidiFile.java
index 7a8855a..2b5f8e9 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiFile.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/com/google/synthesizer/core/midi/MidiFilePlayer.java b/core/src/com/levien/synthesizer/core/midi/MidiFilePlayer.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/midi/MidiFilePlayer.java
rename to core/src/com/levien/synthesizer/core/midi/MidiFilePlayer.java
index 43c891e..0a429ad 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiFilePlayer.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiFilePlayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/core/src/com/google/synthesizer/core/midi/MidiHeader.java b/core/src/com/levien/synthesizer/core/midi/MidiHeader.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiHeader.java
rename to core/src/com/levien/synthesizer/core/midi/MidiHeader.java
index f505e03..da3cdfe 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiHeader.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiHeader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.util.EnumSet;
 
@@ -134,4 +134,4 @@ public class MidiHeader {
   private int ticksPerBeat_;
   private int framesPerSecond_;
   private int ticksPerFrame_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/midi/MidiListener.java b/core/src/com/levien/synthesizer/core/midi/MidiListener.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiListener.java
rename to core/src/com/levien/synthesizer/core/midi/MidiListener.java
index a97b4b2..03d3aed 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiListener.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 /**
  * An interface for listening for any kind of midi event.
diff --git a/core/src/com/google/synthesizer/core/midi/MidiListenerProxy.java b/core/src/com/levien/synthesizer/core/midi/MidiListenerProxy.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/midi/MidiListenerProxy.java
rename to core/src/com/levien/synthesizer/core/midi/MidiListenerProxy.java
index 85bc832..d0ebae3 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiListenerProxy.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiListenerProxy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 /**
  * A MidiListenerProxy is a MidiListener implementation that just passes all the events on to
diff --git a/core/src/com/google/synthesizer/core/midi/MidiReader.java b/core/src/com/levien/synthesizer/core/midi/MidiReader.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/midi/MidiReader.java
rename to core/src/com/levien/synthesizer/core/midi/MidiReader.java
index 0f9ca54..f285bc8 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiReader.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
diff --git a/core/src/com/google/synthesizer/core/midi/MidiTrack.java b/core/src/com/levien/synthesizer/core/midi/MidiTrack.java
similarity index 96%
rename from core/src/com/google/synthesizer/core/midi/MidiTrack.java
rename to core/src/com/levien/synthesizer/core/midi/MidiTrack.java
index c0daf0b..2edc450 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiTrack.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiTrack.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/com/google/synthesizer/core/midi/MidiUtil.java b/core/src/com/levien/synthesizer/core/midi/MidiUtil.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/midi/MidiUtil.java
rename to core/src/com/levien/synthesizer/core/midi/MidiUtil.java
index c9593c1..45ef284 100644
--- a/core/src/com/google/synthesizer/core/midi/MidiUtil.java
+++ b/core/src/com/levien/synthesizer/core/midi/MidiUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.midi;
+package com.levien.synthesizer.core.midi;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/com/google/synthesizer/core/model/CachedFrequencyProvider.java b/core/src/com/levien/synthesizer/core/model/CachedFrequencyProvider.java
similarity index 97%
rename from core/src/com/google/synthesizer/core/model/CachedFrequencyProvider.java
rename to core/src/com/levien/synthesizer/core/model/CachedFrequencyProvider.java
index eb00e1d..ec8f4f3 100644
--- a/core/src/com/google/synthesizer/core/model/CachedFrequencyProvider.java
+++ b/core/src/com/levien/synthesizer/core/model/CachedFrequencyProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * Convenient base class for any module that only wants to compute a new log frequency once at each
diff --git a/core/src/com/google/synthesizer/core/model/CachedSignalProvider.java b/core/src/com/levien/synthesizer/core/model/CachedSignalProvider.java
similarity index 97%
rename from core/src/com/google/synthesizer/core/model/CachedSignalProvider.java
rename to core/src/com/levien/synthesizer/core/model/CachedSignalProvider.java
index 3b51efe..eb212d1 100644
--- a/core/src/com/google/synthesizer/core/model/CachedSignalProvider.java
+++ b/core/src/com/levien/synthesizer/core/model/CachedSignalProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * Convenient base class for any module that only wants to compute a new signal value once at each
diff --git a/core/src/com/google/synthesizer/core/model/Envelope.java b/core/src/com/levien/synthesizer/core/model/Envelope.java
similarity index 96%
rename from core/src/com/google/synthesizer/core/model/Envelope.java
rename to core/src/com/levien/synthesizer/core/model/Envelope.java
index 5ab92e1..a92f49a 100755
--- a/core/src/com/google/synthesizer/core/model/Envelope.java
+++ b/core/src/com/levien/synthesizer/core/model/Envelope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * An interface for any module that shapes a sound based on something like keyboard keys being
diff --git a/core/src/com/google/synthesizer/core/model/FrequencyProvider.java b/core/src/com/levien/synthesizer/core/model/FrequencyProvider.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/model/FrequencyProvider.java
rename to core/src/com/levien/synthesizer/core/model/FrequencyProvider.java
index 258bed0..e2e0817 100644
--- a/core/src/com/google/synthesizer/core/model/FrequencyProvider.java
+++ b/core/src/com/levien/synthesizer/core/model/FrequencyProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * An interface for modules that produce some frequency value.
diff --git a/core/src/com/google/synthesizer/core/model/SignalProvider.java b/core/src/com/levien/synthesizer/core/model/SignalProvider.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/model/SignalProvider.java
rename to core/src/com/levien/synthesizer/core/model/SignalProvider.java
index 9c69a0c..41a3599 100644
--- a/core/src/com/google/synthesizer/core/model/SignalProvider.java
+++ b/core/src/com/levien/synthesizer/core/model/SignalProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * An interface for any module that provides a signal, typically in the range [-1, 1].
diff --git a/core/src/com/google/synthesizer/core/model/SynthesisTime.java b/core/src/com/levien/synthesizer/core/model/SynthesisTime.java
similarity index 97%
rename from core/src/com/google/synthesizer/core/model/SynthesisTime.java
rename to core/src/com/levien/synthesizer/core/model/SynthesisTime.java
index 5944f52..e82e17f 100644
--- a/core/src/com/google/synthesizer/core/model/SynthesisTime.java
+++ b/core/src/com/levien/synthesizer/core/model/SynthesisTime.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * A simple counter to keep track of the logical time in synthesis.
diff --git a/core/src/com/google/synthesizer/core/model/SynthesizerInput.java b/core/src/com/levien/synthesizer/core/model/SynthesizerInput.java
similarity index 97%
rename from core/src/com/google/synthesizer/core/model/SynthesizerInput.java
rename to core/src/com/levien/synthesizer/core/model/SynthesizerInput.java
index c6078b8..e05a17b 100644
--- a/core/src/com/google/synthesizer/core/model/SynthesizerInput.java
+++ b/core/src/com/levien/synthesizer/core/model/SynthesizerInput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 /**
  * SynthesizerInput provides a frequency or signal that doesn't inherently change over time.
diff --git a/core/src/com/google/synthesizer/core/model/WaveformInput.java b/core/src/com/levien/synthesizer/core/model/WaveformInput.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/model/WaveformInput.java
rename to core/src/com/levien/synthesizer/core/model/WaveformInput.java
index d46dd45..6065f13 100644
--- a/core/src/com/google/synthesizer/core/model/WaveformInput.java
+++ b/core/src/com/levien/synthesizer/core/model/WaveformInput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model;
+package com.levien.synthesizer.core.model;
 
 import java.util.ArrayList;
 
diff --git a/core/src/com/google/synthesizer/core/model/composite/MidiSynthesizer.java b/core/src/com/levien/synthesizer/core/model/composite/MidiSynthesizer.java
similarity index 91%
rename from core/src/com/google/synthesizer/core/model/composite/MidiSynthesizer.java
rename to core/src/com/levien/synthesizer/core/model/composite/MidiSynthesizer.java
index 6ed9dce..3de5eda 100644
--- a/core/src/com/google/synthesizer/core/model/composite/MidiSynthesizer.java
+++ b/core/src/com/levien/synthesizer/core/model/composite/MidiSynthesizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.composite;
+package com.levien.synthesizer.core.model.composite;
 
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.music.Note;
-import com.google.synthesizer.core.soundfont.SoundFontReader;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.soundfont.SoundFontReader;
 
 /**
  * MidiSynthesizer is a wrapper around MultiTouchSynthesizer that allows it to accept Midi input in
diff --git a/core/src/com/google/synthesizer/core/model/composite/MultiChannelSynthesizer.java b/core/src/com/levien/synthesizer/core/model/composite/MultiChannelSynthesizer.java
similarity index 90%
rename from core/src/com/google/synthesizer/core/model/composite/MultiChannelSynthesizer.java
rename to core/src/com/levien/synthesizer/core/model/composite/MultiChannelSynthesizer.java
index 66b8023..9e1e4c6 100644
--- a/core/src/com/google/synthesizer/core/model/composite/MultiChannelSynthesizer.java
+++ b/core/src/com/levien/synthesizer/core/model/composite/MultiChannelSynthesizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.composite;
+package com.levien.synthesizer.core.model.composite;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,13 +23,13 @@ import java.util.ArrayList;
 import java.util.logging.Logger;
 
 import com.google.protobuf.TextFormat;
-import com.google.synthesizer.core.midi.MidiAdapter;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.composite.Presets.PresetLibrary;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
-import com.google.synthesizer.core.soundfont.SoundFontReader;
+import com.levien.synthesizer.core.midi.MidiAdapter;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.composite.Presets.PresetLibrary;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.core.soundfont.SoundFontReader;
 
 /**
  * MultiChannelSynthesizer is an array of MidiSynthesizer.
diff --git a/core/src/com/google/synthesizer/core/model/composite/MultiTouchSynthesizer.java b/core/src/com/levien/synthesizer/core/model/composite/MultiTouchSynthesizer.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/model/composite/MultiTouchSynthesizer.java
rename to core/src/com/levien/synthesizer/core/model/composite/MultiTouchSynthesizer.java
index db6c410..06a69b7 100644
--- a/core/src/com/google/synthesizer/core/model/composite/MultiTouchSynthesizer.java
+++ b/core/src/com/levien/synthesizer/core/model/composite/MultiTouchSynthesizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.composite;
+package com.levien.synthesizer.core.model.composite;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,30 +22,30 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.Envelope;
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.WaveformInput;
-import com.google.synthesizer.core.model.composite.Presets.Preset;
-import com.google.synthesizer.core.model.composite.Presets.PresetLibrary;
-import com.google.synthesizer.core.model.composite.Presets.Setting;
-import com.google.synthesizer.core.model.modules.AdsrEnvelope;
-import com.google.synthesizer.core.model.modules.Amplifier;
-import com.google.synthesizer.core.model.modules.Delay;
-import com.google.synthesizer.core.model.modules.Echo;
-import com.google.synthesizer.core.model.modules.Glide;
-import com.google.synthesizer.core.model.modules.LowPassFilter;
-import com.google.synthesizer.core.model.modules.Mixer;
-import com.google.synthesizer.core.model.modules.Tremolo;
-import com.google.synthesizer.core.model.modules.Tuner;
-import com.google.synthesizer.core.model.modules.WaveformSelector;
-import com.google.synthesizer.core.model.oscillator.DrawbarOrgan;
-import com.google.synthesizer.core.model.oscillator.KarplusStrong;
-import com.google.synthesizer.core.soundfont.SoundFontOscillator;
-import com.google.synthesizer.core.soundfont.SoundFontReader;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.Envelope;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.WaveformInput;
+import com.levien.synthesizer.core.model.composite.Presets.Preset;
+import com.levien.synthesizer.core.model.composite.Presets.PresetLibrary;
+import com.levien.synthesizer.core.model.composite.Presets.Setting;
+import com.levien.synthesizer.core.model.modules.AdsrEnvelope;
+import com.levien.synthesizer.core.model.modules.Amplifier;
+import com.levien.synthesizer.core.model.modules.Delay;
+import com.levien.synthesizer.core.model.modules.Echo;
+import com.levien.synthesizer.core.model.modules.Glide;
+import com.levien.synthesizer.core.model.modules.LowPassFilter;
+import com.levien.synthesizer.core.model.modules.Mixer;
+import com.levien.synthesizer.core.model.modules.Tremolo;
+import com.levien.synthesizer.core.model.modules.Tuner;
+import com.levien.synthesizer.core.model.modules.WaveformSelector;
+import com.levien.synthesizer.core.model.oscillator.DrawbarOrgan;
+import com.levien.synthesizer.core.model.oscillator.KarplusStrong;
+import com.levien.synthesizer.core.soundfont.SoundFontOscillator;
+import com.levien.synthesizer.core.soundfont.SoundFontReader;
 
 /**
  * MultiTouchSynthesizer is a collection of synthesizer modules, connected together in a way similar
diff --git a/core/src/com/google/synthesizer/core/model/composite/Presets.proto b/core/src/com/levien/synthesizer/core/model/composite/Presets.proto
similarity index 97%
rename from core/src/com/google/synthesizer/core/model/composite/Presets.proto
rename to core/src/com/levien/synthesizer/core/model/composite/Presets.proto
index 70fac54..8eb42c7 100644
--- a/core/src/com/google/synthesizer/core/model/composite/Presets.proto
+++ b/core/src/com/levien/synthesizer/core/model/composite/Presets.proto
@@ -16,7 +16,7 @@
 
 package synthesizer_core_proto;
 
-option java_package = "com.google.synthesizer.core.model.composite";
+option java_package = "com.levien.synthesizer.core.model.composite";
 
 enum WaveformDeprecated {
   SINE = 0;
diff --git a/core/src/com/google/synthesizer/core/model/modules/AdsrEnvelope.java b/core/src/com/levien/synthesizer/core/model/modules/AdsrEnvelope.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/model/modules/AdsrEnvelope.java
rename to core/src/com/levien/synthesizer/core/model/modules/AdsrEnvelope.java
index e408214..0ae03fb 100644
--- a/core/src/com/google/synthesizer/core/model/modules/AdsrEnvelope.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/AdsrEnvelope.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.Envelope;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.Envelope;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An ADSR is the most common envelope for a synth.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Amplifier.java b/core/src/com/levien/synthesizer/core/model/modules/Amplifier.java
similarity index 89%
rename from core/src/com/google/synthesizer/core/model/modules/Amplifier.java
rename to core/src/com/levien/synthesizer/core/model/modules/Amplifier.java
index 8326727..8dbe4ea 100755
--- a/core/src/com/google/synthesizer/core/model/modules/Amplifier.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Amplifier.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Amplifier simply multiplies the input signal by the input gain.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Delay.java b/core/src/com/levien/synthesizer/core/model/modules/Delay.java
similarity index 93%
rename from core/src/com/google/synthesizer/core/model/modules/Delay.java
rename to core/src/com/levien/synthesizer/core/model/modules/Delay.java
index 06d00dc..d166b96 100755
--- a/core/src/com/google/synthesizer/core/model/modules/Delay.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Delay.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
 import java.util.Arrays;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Delay is a module for recording sampled sound and playing it back later.  It has 3 modes.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Echo.java b/core/src/com/levien/synthesizer/core/model/modules/Echo.java
similarity index 92%
rename from core/src/com/google/synthesizer/core/model/modules/Echo.java
rename to core/src/com/levien/synthesizer/core/model/modules/Echo.java
index 5fe643a..fa347ae 100755
--- a/core/src/com/google/synthesizer/core/model/modules/Echo.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Echo.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * The Echo module produces an echo effect by mixing its current input with its earlier input.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Glide.java b/core/src/com/levien/synthesizer/core/model/modules/Glide.java
similarity index 90%
rename from core/src/com/google/synthesizer/core/model/modules/Glide.java
rename to core/src/com/levien/synthesizer/core/model/modules/Glide.java
index 7213ac8..e23e97f 100644
--- a/core/src/com/google/synthesizer/core/model/modules/Glide.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Glide.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.CachedFrequencyProvider;
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedFrequencyProvider;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Glide smooths changes in frequency over time.
diff --git a/core/src/com/google/synthesizer/core/model/modules/LowPassFilter.java b/core/src/com/levien/synthesizer/core/model/modules/LowPassFilter.java
similarity index 87%
rename from core/src/com/google/synthesizer/core/model/modules/LowPassFilter.java
rename to core/src/com/levien/synthesizer/core/model/modules/LowPassFilter.java
index 80d0deb..8d8b31b 100644
--- a/core/src/com/google/synthesizer/core/model/modules/LowPassFilter.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/LowPassFilter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * A very simple low-pass filter.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Mixer.java b/core/src/com/levien/synthesizer/core/model/modules/Mixer.java
similarity index 91%
rename from core/src/com/google/synthesizer/core/model/modules/Mixer.java
rename to core/src/com/levien/synthesizer/core/model/modules/Mixer.java
index 85723f0..950a5be 100755
--- a/core/src/com/google/synthesizer/core/model/modules/Mixer.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Mixer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Mixer outputs a weighted average of two input signals.
diff --git a/core/src/com/google/synthesizer/core/model/modules/Tremolo.java b/core/src/com/levien/synthesizer/core/model/modules/Tremolo.java
similarity index 89%
rename from core/src/com/google/synthesizer/core/model/modules/Tremolo.java
rename to core/src/com/levien/synthesizer/core/model/modules/Tremolo.java
index bbb1e75..2f3878b 100644
--- a/core/src/com/google/synthesizer/core/model/modules/Tremolo.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Tremolo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Module to modulate an amplitude over time based on a modulator signal.  Its output is intended to
diff --git a/core/src/com/google/synthesizer/core/model/modules/Tuner.java b/core/src/com/levien/synthesizer/core/model/modules/Tuner.java
similarity index 85%
rename from core/src/com/google/synthesizer/core/model/modules/Tuner.java
rename to core/src/com/levien/synthesizer/core/model/modules/Tuner.java
index 0e693de..bb7e7ee 100644
--- a/core/src/com/google/synthesizer/core/model/modules/Tuner.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/Tuner.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * Module to modify the output of a frequency provider.
diff --git a/core/src/com/google/synthesizer/core/model/modules/WaveformSelector.java b/core/src/com/levien/synthesizer/core/model/modules/WaveformSelector.java
similarity index 79%
rename from core/src/com/google/synthesizer/core/model/modules/WaveformSelector.java
rename to core/src/com/levien/synthesizer/core/model/modules/WaveformSelector.java
index 159243e..6cff8b9 100644
--- a/core/src/com/google/synthesizer/core/model/modules/WaveformSelector.java
+++ b/core/src/com/levien/synthesizer/core/model/modules/WaveformSelector.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules;
+package com.levien.synthesizer.core.model.modules;
 
 import java.util.ArrayList;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.WaveformInput;
-import com.google.synthesizer.core.model.oscillator.Noise;
-import com.google.synthesizer.core.model.oscillator.Sawtooth;
-import com.google.synthesizer.core.model.oscillator.Sine;
-import com.google.synthesizer.core.model.oscillator.Square;
-import com.google.synthesizer.core.model.oscillator.Triangle;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.WaveformInput;
+import com.levien.synthesizer.core.model.oscillator.Noise;
+import com.levien.synthesizer.core.model.oscillator.Sawtooth;
+import com.levien.synthesizer.core.model.oscillator.Sine;
+import com.levien.synthesizer.core.model.oscillator.Square;
+import com.levien.synthesizer.core.model.oscillator.Triangle;
 
 /**
  * Module that outputs a waveform from a selectable set of oscillators.
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/DrawbarOrgan.java b/core/src/com/levien/synthesizer/core/model/oscillator/DrawbarOrgan.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/model/oscillator/DrawbarOrgan.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/DrawbarOrgan.java
index d667af2..06ed36a 100644
--- a/core/src/com/google/synthesizer/core/model/oscillator/DrawbarOrgan.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/DrawbarOrgan.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that emulates a set of tone wheels for a drawbar organ.
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/KarplusStrong.java b/core/src/com/levien/synthesizer/core/model/oscillator/KarplusStrong.java
similarity index 93%
rename from core/src/com/google/synthesizer/core/model/oscillator/KarplusStrong.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/KarplusStrong.java
index b88b8f8..92683e9 100644
--- a/core/src/com/google/synthesizer/core/model/oscillator/KarplusStrong.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/KarplusStrong.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.Envelope;
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.Envelope;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 import java.util.Arrays;
 
 /**
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Noise.java b/core/src/com/levien/synthesizer/core/model/oscillator/Noise.java
similarity index 84%
rename from core/src/com/google/synthesizer/core/model/oscillator/Noise.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Noise.java
index 9c1dfea..f4589a2 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Noise.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Noise.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that outputs random values in the range [-1, 1].
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Oscillator.java b/core/src/com/levien/synthesizer/core/model/oscillator/Oscillator.java
similarity index 85%
rename from core/src/com/google/synthesizer/core/model/oscillator/Oscillator.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Oscillator.java
index 46183a3..ddb232a 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Oscillator.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Oscillator.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.FrequencyProvider;
 
 /**
   * Subclass for any oscillator -- any module that outputs a waveform based on a given frequency.
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Sawtooth.java b/core/src/com/levien/synthesizer/core/model/oscillator/Sawtooth.java
similarity index 90%
rename from core/src/com/google/synthesizer/core/model/oscillator/Sawtooth.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Sawtooth.java
index a530cdf..c32ddba 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Sawtooth.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Sawtooth.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that outputs a sawtooth wave.
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Sine.java b/core/src/com/levien/synthesizer/core/model/oscillator/Sine.java
similarity index 91%
rename from core/src/com/google/synthesizer/core/model/oscillator/Sine.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Sine.java
index d76e36f..865a168 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Sine.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Sine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that outputs a sine wave.
@@ -58,4 +58,4 @@ public class Sine extends Oscillator {
   // Amplitude and frequency for the current output value.
   private double currentLogFrequency_;
   private double currentFrequency_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Square.java b/core/src/com/levien/synthesizer/core/model/oscillator/Square.java
similarity index 86%
rename from core/src/com/google/synthesizer/core/model/oscillator/Square.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Square.java
index 14b3a3f..b8b88fa 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Square.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Square.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that outputs a square wave.
diff --git a/core/src/com/google/synthesizer/core/model/oscillator/Triangle.java b/core/src/com/levien/synthesizer/core/model/oscillator/Triangle.java
similarity index 86%
rename from core/src/com/google/synthesizer/core/model/oscillator/Triangle.java
rename to core/src/com/levien/synthesizer/core/model/oscillator/Triangle.java
index 557da46..aaea06b 100755
--- a/core/src/com/google/synthesizer/core/model/oscillator/Triangle.java
+++ b/core/src/com/levien/synthesizer/core/model/oscillator/Triangle.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator;
+package com.levien.synthesizer.core.model.oscillator;
 
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * An oscillator module that outputs a triangle wave.
diff --git a/core/src/com/google/synthesizer/core/music/EventComparator.java b/core/src/com/levien/synthesizer/core/music/EventComparator.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/music/EventComparator.java
rename to core/src/com/levien/synthesizer/core/music/EventComparator.java
index a32441c..651302a 100644
--- a/core/src/com/google/synthesizer/core/music/EventComparator.java
+++ b/core/src/com/levien/synthesizer/core/music/EventComparator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.music;
+package com.levien.synthesizer.core.music;
 
 import java.util.Comparator;
 
-import com.google.synthesizer.core.music.Music.EventOrBuilder;
+import com.levien.synthesizer.core.music.Music.EventOrBuilder;
 
 /**
  * A few comparators for sorting lists of Events (like in a score).
diff --git a/core/src/com/google/synthesizer/core/music/Music.proto b/core/src/com/levien/synthesizer/core/music/Music.proto
similarity index 97%
rename from core/src/com/google/synthesizer/core/music/Music.proto
rename to core/src/com/levien/synthesizer/core/music/Music.proto
index 0df7df3..1848c0b 100644
--- a/core/src/com/google/synthesizer/core/music/Music.proto
+++ b/core/src/com/levien/synthesizer/core/music/Music.proto
@@ -16,7 +16,7 @@
 
 package synthesizer_core_music;
 
-option java_package = "com.google.synthesizer.core.music";
+option java_package = "com.levien.synthesizer.core.music";
 
 // An Event is one item in a score.  It has a start and end time, and information about what
 // happens at that time, such as what note is played, and on what channel (instrument).
diff --git a/core/src/com/google/synthesizer/core/music/Note.java b/core/src/com/levien/synthesizer/core/music/Note.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/music/Note.java
rename to core/src/com/levien/synthesizer/core/music/Note.java
index 09a6bd6..49a8428 100755
--- a/core/src/com/google/synthesizer/core/music/Note.java
+++ b/core/src/com/levien/synthesizer/core/music/Note.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.music;
+package com.levien.synthesizer.core.music;
 
 /**
  * Collection of static methods dealing with musical notes.
diff --git a/core/src/com/google/synthesizer/core/music/ScorePlayer.java b/core/src/com/levien/synthesizer/core/music/ScorePlayer.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/music/ScorePlayer.java
rename to core/src/com/levien/synthesizer/core/music/ScorePlayer.java
index 3273a9f..8667b9f 100644
--- a/core/src/com/google/synthesizer/core/music/ScorePlayer.java
+++ b/core/src/com/levien/synthesizer/core/music/ScorePlayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.music;
+package com.levien.synthesizer.core.music;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,9 +22,9 @@ import java.util.ListIterator;
 import java.util.PriorityQueue;
 import java.util.logging.Logger;
 
-import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
-import com.google.synthesizer.core.music.Music.Event;
-import com.google.synthesizer.core.music.Music.Score;
+import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
+import com.levien.synthesizer.core.music.Music.Event;
+import com.levien.synthesizer.core.music.Music.Score;
 
 /**
  * Methods for playing a score using a synthesizer.
diff --git a/core/src/com/google/synthesizer/core/music/ScorePlayerListener.java b/core/src/com/levien/synthesizer/core/music/ScorePlayerListener.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/music/ScorePlayerListener.java
rename to core/src/com/levien/synthesizer/core/music/ScorePlayerListener.java
index f4f0253..ea6d61b 100644
--- a/core/src/com/google/synthesizer/core/music/ScorePlayerListener.java
+++ b/core/src/com/levien/synthesizer/core/music/ScorePlayerListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.music;
+package com.levien.synthesizer.core.music;
 
 /**
  * Listener for events from a ScorePlayer.
diff --git a/core/src/com/google/synthesizer/core/soundfont/Bag.java b/core/src/com/levien/synthesizer/core/soundfont/Bag.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/soundfont/Bag.java
rename to core/src/com/levien/synthesizer/core/soundfont/Bag.java
index 83cfb0a..c3671fd 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Bag.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Bag.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * A Bag is a structure particular to the SoundFont format that represents a list of generators and
@@ -93,4 +93,4 @@ public class Bag {
   private int modulatorStart_;
   private int generatorEnd_;
   private int modulatorEnd_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/soundfont/Generator.java b/core/src/com/levien/synthesizer/core/soundfont/Generator.java
similarity index 93%
rename from core/src/com/google/synthesizer/core/soundfont/Generator.java
rename to core/src/com/levien/synthesizer/core/soundfont/Generator.java
index 51b4669..6cc4793 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Generator.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Generator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * A Generator is a SoundFont data structure that represents an "operator" and an "amount".
diff --git a/core/src/com/google/synthesizer/core/soundfont/Instrument.java b/core/src/com/levien/synthesizer/core/soundfont/Instrument.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/soundfont/Instrument.java
rename to core/src/com/levien/synthesizer/core/soundfont/Instrument.java
index 40d8aa4..57775a4 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Instrument.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Instrument.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * An instrument is a SoundFont data structure that consists of a set of zones.  Each "zone" is
@@ -75,4 +75,4 @@ public class Instrument {
   private int bagStart_;
   private int bagEnd_;
   private ArrayList<Zone> zoneList_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/soundfont/Modulator.java b/core/src/com/levien/synthesizer/core/soundfont/Modulator.java
similarity index 93%
rename from core/src/com/google/synthesizer/core/soundfont/Modulator.java
rename to core/src/com/levien/synthesizer/core/soundfont/Modulator.java
index 24aec7f..0d5811b 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Modulator.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Modulator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * A Modulator is a SoundFont data structure.  They are read in by this library, but then ignored.
@@ -50,4 +50,4 @@ public class Modulator {
   public short amount;
   public ModulatorSource amountOperator;
   public int transform;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/soundfont/ModulatorSource.java b/core/src/com/levien/synthesizer/core/soundfont/ModulatorSource.java
similarity index 96%
rename from core/src/com/google/synthesizer/core/soundfont/ModulatorSource.java
rename to core/src/com/levien/synthesizer/core/soundfont/ModulatorSource.java
index c26d8ba..12b694c 100644
--- a/core/src/com/google/synthesizer/core/soundfont/ModulatorSource.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/ModulatorSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 /**
  * A ModulatorSource is a SoundFont data structure.  They are read by this library and then ignored.
diff --git a/core/src/com/google/synthesizer/core/soundfont/Operator.java b/core/src/com/levien/synthesizer/core/soundfont/Operator.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/soundfont/Operator.java
rename to core/src/com/levien/synthesizer/core/soundfont/Operator.java
index 2d77852..21d5c0e 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Operator.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Operator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 /**
  * An enumeration of all possible SoundFont Generator Operators.
diff --git a/core/src/com/google/synthesizer/core/soundfont/Preset.java b/core/src/com/levien/synthesizer/core/soundfont/Preset.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/soundfont/Preset.java
rename to core/src/com/levien/synthesizer/core/soundfont/Preset.java
index 72d24f0..9dcaa7f 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Preset.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Preset.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * A Preset is a SoundFont data structure that corresponds to a bunch of "preset zones" and a set
@@ -90,4 +90,4 @@ public class Preset {
   private long genre_;
   @SuppressWarnings("unused")
   private long morphology_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/soundfont/Sample.java b/core/src/com/levien/synthesizer/core/soundfont/Sample.java
similarity index 96%
rename from core/src/com/google/synthesizer/core/soundfont/Sample.java
rename to core/src/com/levien/synthesizer/core/soundfont/Sample.java
index fc53f50..5c9ada6 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Sample.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Sample.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.IOException;
 
-import com.google.synthesizer.core.wave.RiffInputStream;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * A Sample is a subset of sample data from a SoundFont file.
@@ -116,4 +116,4 @@ public class Sample {
 
   // All of the actual sample data from the SoundFont file.
   private double[] sample_;
-}
\ No newline at end of file
+}
diff --git a/core/src/com/google/synthesizer/core/soundfont/SampleLink.java b/core/src/com/levien/synthesizer/core/soundfont/SampleLink.java
similarity index 96%
rename from core/src/com/google/synthesizer/core/soundfont/SampleLink.java
rename to core/src/com/levien/synthesizer/core/soundfont/SampleLink.java
index 12f074b..df3c96a 100644
--- a/core/src/com/google/synthesizer/core/soundfont/SampleLink.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/SampleLink.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 /**
  * SampleLink enum for the SoundFont format.
diff --git a/core/src/com/google/synthesizer/core/soundfont/SoundFontOscillator.java b/core/src/com/levien/synthesizer/core/soundfont/SoundFontOscillator.java
similarity index 95%
rename from core/src/com/google/synthesizer/core/soundfont/SoundFontOscillator.java
rename to core/src/com/levien/synthesizer/core/soundfont/SoundFontOscillator.java
index 2ae48eb..7f5165e 100644
--- a/core/src/com/google/synthesizer/core/soundfont/SoundFontOscillator.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/SoundFontOscillator.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.util.Arrays;
 import java.util.logging.Logger;
 
-import com.google.synthesizer.core.model.Envelope;
-import com.google.synthesizer.core.model.FrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.oscillator.Oscillator;
-import com.google.synthesizer.core.music.Note;
-import com.google.synthesizer.core.soundfont.Zone.SampleMode;
+import com.levien.synthesizer.core.model.Envelope;
+import com.levien.synthesizer.core.model.FrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.oscillator.Oscillator;
+import com.levien.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.soundfont.Zone.SampleMode;
 
 /**
  * An oscillator module that outputs a sample from a file.
diff --git a/core/src/com/google/synthesizer/core/soundfont/SoundFontReader.java b/core/src/com/levien/synthesizer/core/soundfont/SoundFontReader.java
similarity index 98%
rename from core/src/com/google/synthesizer/core/soundfont/SoundFontReader.java
rename to core/src/com/levien/synthesizer/core/soundfont/SoundFontReader.java
index ead8fe3..f482da6 100644
--- a/core/src/com/google/synthesizer/core/soundfont/SoundFontReader.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/SoundFontReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-//import com.google.synthesizer.core.model.sample.Proto;
-import com.google.synthesizer.core.wave.RiffInputStream;
+//import com.levien.synthesizer.core.model.sample.Proto;
+import com.levien.synthesizer.core.wave.RiffInputStream;
 
 /**
  * Reads a SoundFont file from a stream and provides access its data.
diff --git a/core/src/com/google/synthesizer/core/soundfont/Zone.java b/core/src/com/levien/synthesizer/core/soundfont/Zone.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/soundfont/Zone.java
rename to core/src/com/levien/synthesizer/core/soundfont/Zone.java
index 421b58d..db077af 100644
--- a/core/src/com/google/synthesizer/core/soundfont/Zone.java
+++ b/core/src/com/levien/synthesizer/core/soundfont/Zone.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.soundfont;
+package com.levien.synthesizer.core.soundfont;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/com/google/synthesizer/core/wave/RiffInputStream.java b/core/src/com/levien/synthesizer/core/wave/RiffInputStream.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/wave/RiffInputStream.java
rename to core/src/com/levien/synthesizer/core/wave/RiffInputStream.java
index ea56932..73c8b37 100644
--- a/core/src/com/google/synthesizer/core/wave/RiffInputStream.java
+++ b/core/src/com/levien/synthesizer/core/wave/RiffInputStream.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.synthesizer.core.wave;
+package com.levien.synthesizer.core.wave;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/core/src/com/google/synthesizer/core/wave/WaveAdapter.java b/core/src/com/levien/synthesizer/core/wave/WaveAdapter.java
similarity index 94%
rename from core/src/com/google/synthesizer/core/wave/WaveAdapter.java
rename to core/src/com/levien/synthesizer/core/wave/WaveAdapter.java
index 3a1929f..71f1ce6 100644
--- a/core/src/com/google/synthesizer/core/wave/WaveAdapter.java
+++ b/core/src/com/levien/synthesizer/core/wave/WaveAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.wave;
+package com.levien.synthesizer.core.wave;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 /**
  * A WaveAdapter wraps a synthesizer component and allows siphoning off its output and writing it to
diff --git a/core/src/com/google/synthesizer/core/wave/WaveReader.java b/core/src/com/levien/synthesizer/core/wave/WaveReader.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/wave/WaveReader.java
rename to core/src/com/levien/synthesizer/core/wave/WaveReader.java
index bab963b..f3b5113 100644
--- a/core/src/com/google/synthesizer/core/wave/WaveReader.java
+++ b/core/src/com/levien/synthesizer/core/wave/WaveReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.wave;
+package com.levien.synthesizer.core.wave;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/com/google/synthesizer/core/wave/WaveWriter.java b/core/src/com/levien/synthesizer/core/wave/WaveWriter.java
similarity index 99%
rename from core/src/com/google/synthesizer/core/wave/WaveWriter.java
rename to core/src/com/levien/synthesizer/core/wave/WaveWriter.java
index 76adec5..b490889 100644
--- a/core/src/com/google/synthesizer/core/wave/WaveWriter.java
+++ b/core/src/com/levien/synthesizer/core/wave/WaveWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.wave;
+package com.levien.synthesizer.core.wave;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/cpp/src/android_glue.cc b/cpp/src/android_glue.cc
index b8b6ee5..8555240 100644
--- a/cpp/src/android_glue.cc
+++ b/cpp/src/android_glue.cc
@@ -133,7 +133,7 @@ SLresult result;
   }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_start(JNIEnv *env,
+Java_com_levien_synthesizer_android_AndroidGlue_start(JNIEnv *env,
     jobject thiz, jint sample_rate, jint buf_size) {
   CreateEngine();
   SLDataLocator_AndroidSimpleBufferQueue loc_bufq =
@@ -182,7 +182,7 @@ Java_com_google_synthesizer_android_AndroidGlue_start(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
+Java_com_levien_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
     jobject thiz) {
   LOGI("shutting down engine");
   if (bqPlayerObject != NULL) {
@@ -209,7 +209,7 @@ Java_com_google_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
+Java_com_levien_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
     jobject thiz, jbyteArray jb) {
   uint8_t *data = (uint8_t *)env->GetByteArrayElements(jb, NULL);
   if (data != NULL) {
@@ -219,7 +219,7 @@ Java_com_google_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
+Java_com_levien_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
     jobject thiz, jboolean isPlaying) {
   SLresult result = (*bq_player_play)->SetPlayState(bq_player_play,
       isPlaying ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_PAUSED);
@@ -227,13 +227,13 @@ Java_com_google_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT jint JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_statsBytesAvailable(
+Java_com_levien_synthesizer_android_AndroidGlue_statsBytesAvailable(
     JNIEnv *env, jobject thiz) {
   return stats_ring_buffer->BytesAvailable();
 }
 
 extern "C" JNIEXPORT jint JNICALL
-Java_com_google_synthesizer_android_AndroidGlue_readStatsBytes(
+Java_com_levien_synthesizer_android_AndroidGlue_readStatsBytes(
     JNIEnv *env, jobject thiz, jbyteArray jb, jint off, jint len) {
   int bytes_available = stats_ring_buffer->BytesAvailable();
   int n = min(bytes_available, len);
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java
similarity index 97%
rename from test/src/com/google/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java
index cd22155..7ddecea 100755
--- a/test/src/com/google/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/AdsrEnvelopeTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
 import junit.framework.TestCase;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.AdsrEnvelope;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.AdsrEnvelope;
 
 public class AdsrEnvelopeTest extends TestCase {
   final private static double TOLERANCE = 0.0001;
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/AmplifierTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/AmplifierTest.java
similarity index 78%
rename from test/src/com/google/synthesizer/core/model/modules/test/AmplifierTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/AmplifierTest.java
index eaac86a..67b4fb9 100755
--- a/test/src/com/google/synthesizer/core/model/modules/test/AmplifierTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/AmplifierTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Amplifier;
+import com.levien.synthesizer.core.model.SignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Amplifier;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/DelayTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/DelayTest.java
similarity index 93%
rename from test/src/com/google/synthesizer/core/model/modules/test/DelayTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/DelayTest.java
index 7ef5fce..065133e 100755
--- a/test/src/com/google/synthesizer/core/model/modules/test/DelayTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/DelayTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Delay;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Delay;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/EchoTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/EchoTest.java
similarity index 90%
rename from test/src/com/google/synthesizer/core/model/modules/test/EchoTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/EchoTest.java
index d780876..7ecdf70 100755
--- a/test/src/com/google/synthesizer/core/model/modules/test/EchoTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/EchoTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Echo;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Echo;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/GlideTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/GlideTest.java
similarity index 90%
rename from test/src/com/google/synthesizer/core/model/modules/test/GlideTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/GlideTest.java
index fc40fdc..d0801d5 100644
--- a/test/src/com/google/synthesizer/core/model/modules/test/GlideTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/GlideTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Glide;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Glide;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/MixerTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/MixerTest.java
similarity index 87%
rename from test/src/com/google/synthesizer/core/model/modules/test/MixerTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/MixerTest.java
index 9d9481f..d817ffb 100755
--- a/test/src/com/google/synthesizer/core/model/modules/test/MixerTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/MixerTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Mixer;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Mixer;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/TremoloTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/TremoloTest.java
similarity index 95%
rename from test/src/com/google/synthesizer/core/model/modules/test/TremoloTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/TremoloTest.java
index 9e13872..a17597f 100644
--- a/test/src/com/google/synthesizer/core/model/modules/test/TremoloTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/TremoloTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Tremolo;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Tremolo;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/modules/test/TunerTest.java b/test/src/com/levien/synthesizer/core/model/modules/test/TunerTest.java
similarity index 89%
rename from test/src/com/google/synthesizer/core/model/modules/test/TunerTest.java
rename to test/src/com/levien/synthesizer/core/model/modules/test/TunerTest.java
index 13787a6..75608ca 100644
--- a/test/src/com/google/synthesizer/core/model/modules/test/TunerTest.java
+++ b/test/src/com/levien/synthesizer/core/model/modules/test/TunerTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.modules.test;
+package com.levien.synthesizer.core.model.modules.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.modules.Tuner;
-import com.google.synthesizer.core.music.Note;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.modules.Tuner;
+import com.levien.synthesizer.core.music.Note;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/oscillator/test/OscillatorTest.java b/test/src/com/levien/synthesizer/core/model/oscillator/test/OscillatorTest.java
similarity index 81%
rename from test/src/com/google/synthesizer/core/model/oscillator/test/OscillatorTest.java
rename to test/src/com/levien/synthesizer/core/model/oscillator/test/OscillatorTest.java
index e8dc95d..2fc82c6 100755
--- a/test/src/com/google/synthesizer/core/model/oscillator/test/OscillatorTest.java
+++ b/test/src/com/levien/synthesizer/core/model/oscillator/test/OscillatorTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator.test;
+package com.levien.synthesizer.core.model.oscillator.test;
 
-import com.google.synthesizer.core.model.oscillator.Oscillator;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.oscillator.Oscillator;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/oscillator/test/SawtoothTest.java b/test/src/com/levien/synthesizer/core/model/oscillator/test/SawtoothTest.java
similarity index 93%
rename from test/src/com/google/synthesizer/core/model/oscillator/test/SawtoothTest.java
rename to test/src/com/levien/synthesizer/core/model/oscillator/test/SawtoothTest.java
index c572759..466a5d3 100755
--- a/test/src/com/google/synthesizer/core/model/oscillator/test/SawtoothTest.java
+++ b/test/src/com/levien/synthesizer/core/model/oscillator/test/SawtoothTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator.test;
+package com.levien.synthesizer.core.model.oscillator.test;
 
-import com.google.synthesizer.core.model.oscillator.Sawtooth;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.oscillator.Sawtooth;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/oscillator/test/SineTest.java b/test/src/com/levien/synthesizer/core/model/oscillator/test/SineTest.java
similarity index 92%
rename from test/src/com/google/synthesizer/core/model/oscillator/test/SineTest.java
rename to test/src/com/levien/synthesizer/core/model/oscillator/test/SineTest.java
index e3f0773..9d8b083 100755
--- a/test/src/com/google/synthesizer/core/model/oscillator/test/SineTest.java
+++ b/test/src/com/levien/synthesizer/core/model/oscillator/test/SineTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator.test;
+package com.levien.synthesizer.core.model.oscillator.test;
 
-import com.google.synthesizer.core.model.oscillator.Sine;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.oscillator.Sine;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/oscillator/test/SquareTest.java b/test/src/com/levien/synthesizer/core/model/oscillator/test/SquareTest.java
similarity index 92%
rename from test/src/com/google/synthesizer/core/model/oscillator/test/SquareTest.java
rename to test/src/com/levien/synthesizer/core/model/oscillator/test/SquareTest.java
index b907e01..ca0a6a3 100755
--- a/test/src/com/google/synthesizer/core/model/oscillator/test/SquareTest.java
+++ b/test/src/com/levien/synthesizer/core/model/oscillator/test/SquareTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator.test;
+package com.levien.synthesizer.core.model.oscillator.test;
 
-import com.google.synthesizer.core.model.oscillator.Square;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.oscillator.Square;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/oscillator/test/TriangleTest.java b/test/src/com/levien/synthesizer/core/model/oscillator/test/TriangleTest.java
similarity index 93%
rename from test/src/com/google/synthesizer/core/model/oscillator/test/TriangleTest.java
rename to test/src/com/levien/synthesizer/core/model/oscillator/test/TriangleTest.java
index 566274c..f0668f0 100755
--- a/test/src/com/google/synthesizer/core/model/oscillator/test/TriangleTest.java
+++ b/test/src/com/levien/synthesizer/core/model/oscillator/test/TriangleTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.oscillator.test;
+package com.levien.synthesizer.core.model.oscillator.test;
 
-import com.google.synthesizer.core.model.oscillator.Triangle;
-import com.google.synthesizer.core.model.SynthesisTime;
-import com.google.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
+import com.levien.synthesizer.core.model.oscillator.Triangle;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/test/CachedFrequencyProviderTest.java b/test/src/com/levien/synthesizer/core/model/test/CachedFrequencyProviderTest.java
similarity index 92%
rename from test/src/com/google/synthesizer/core/model/test/CachedFrequencyProviderTest.java
rename to test/src/com/levien/synthesizer/core/model/test/CachedFrequencyProviderTest.java
index c593c0b..219f5fa 100644
--- a/test/src/com/google/synthesizer/core/model/test/CachedFrequencyProviderTest.java
+++ b/test/src/com/levien/synthesizer/core/model/test/CachedFrequencyProviderTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.test;
+package com.levien.synthesizer.core.model.test;
 
-import com.google.synthesizer.core.model.CachedFrequencyProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedFrequencyProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/test/CachedSignalProviderTest.java b/test/src/com/levien/synthesizer/core/model/test/CachedSignalProviderTest.java
similarity index 91%
rename from test/src/com/google/synthesizer/core/model/test/CachedSignalProviderTest.java
rename to test/src/com/levien/synthesizer/core/model/test/CachedSignalProviderTest.java
index d48cda6..18b3ddf 100644
--- a/test/src/com/google/synthesizer/core/model/test/CachedSignalProviderTest.java
+++ b/test/src/com/levien/synthesizer/core/model/test/CachedSignalProviderTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.test;
+package com.levien.synthesizer.core.model.test;
 
-import com.google.synthesizer.core.model.CachedSignalProvider;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.CachedSignalProvider;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/test/SynthesisTimeTest.java b/test/src/com/levien/synthesizer/core/model/test/SynthesisTimeTest.java
similarity index 96%
rename from test/src/com/google/synthesizer/core/model/test/SynthesisTimeTest.java
rename to test/src/com/levien/synthesizer/core/model/test/SynthesisTimeTest.java
index 07851eb..79e5679 100644
--- a/test/src/com/google/synthesizer/core/model/test/SynthesisTimeTest.java
+++ b/test/src/com/levien/synthesizer/core/model/test/SynthesisTimeTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.test;
+package com.levien.synthesizer.core.model.test;
 
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesisTime;
 
 import junit.framework.TestCase;
 
diff --git a/test/src/com/google/synthesizer/core/model/test/SynthesizerInputTest.java b/test/src/com/levien/synthesizer/core/model/test/SynthesizerInputTest.java
similarity index 94%
rename from test/src/com/google/synthesizer/core/model/test/SynthesizerInputTest.java
rename to test/src/com/levien/synthesizer/core/model/test/SynthesizerInputTest.java
index e77760b..d0825b1 100644
--- a/test/src/com/google/synthesizer/core/model/test/SynthesizerInputTest.java
+++ b/test/src/com/levien/synthesizer/core/model/test/SynthesizerInputTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.synthesizer.core.model.test;
+package com.levien.synthesizer.core.model.test;
 
-import com.google.synthesizer.core.model.SynthesizerInput;
-import com.google.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesisTime;
+import com.levien.synthesizer.core.model.SynthesizerInput;
 
 import junit.framework.TestCase;