Changed a little on the files as per the change of package structure.