re structured everything