Reorganized packages. Moved internal classes to new internal package.