Corrected imports and MANIFEST