Better folders structure and replace hashes with arrays for speed