final touches and directory cleanup