BUG: Added missing files from new package