Fixed clockwise problem, restructure more