Second commit fixing folders