updated package with respect to new file names and folder structure