Mass package refactor (removed plural from package names)