move files to subpackages