Bring source into package
Rename for source