renaming and organizing code
Revert "renaming and organizing code"

This reverts commit 420f53cf4ba6f1574e2feaa2e853c4a78cdadaf4.
renamed NarratorAppState.java; client code no longer has to attach the narrator to the state manager (see NarratorTest.java)