moved packages around to avoid symbolic links, which can cause confusion