Make package self-contained