Clean up for new directory org