changed folder implementation, unit tests for folders work