Updated header & footer files with modified subpackage names.