Files and folders restructuring
Bug fix in list implementation