refactored hashtable to folder