relocating files into sub packages
merge