renamed and fixed folders