Updates made to directory structuring