We should remove old JCP from sources(move new sources to jdk.deploy.controlpanel, remove jdk.deploy.controlpanel.fx module, remove old srcs from jdk.deploy.controlpanel, correct some other things). We can live with old JCP in the module, without problems, but still we need some cleanup.