Major clenup and restructuration