corrected imports in subdirectories