Merged two packages

Created changes in the file-folder structure, merged the two packages and did the appropriate changes in the two packages.