Update moved FIR package definition.

We should rationalize package names and have them correspond (in the
Java sense) with the location of the relevant source files.