Clean up installation per new directory structure and test that things actually work