Restructure and cleanup setup.