New Dir structure

Sean made new dir structure