Updates folder structure and removes duplication
Simplifies nest indexer