fixed bad folder organization