Cleanup and initial structure setup