Reorganized classes into a package structure rather than using the
default package for everything.