Merged into single module from package