Minor file hierarchy change, new prosody scoring