folder organization and a few fixes