Changed structure for internal module development.