reorginized directories and deleted old stuff