SpeakinginTongues + packages reorganization