Changed some folders around