Change from package to single module