updated folder structuring