Fixed Part 2 folder import issues