directory cleanup and structure for future tests