re structured :)