Added person ID
Changed package declarations to match directory structure