Simplified the package into one whole repository.