refactor the jUnit folders