minor restructuring, to enable further downloads from original repo, include some more packages