revamp folder structure