Reorganized files into a package and test program.