Move jdk-1.6 modules to jdk-1.7/ folder