Removed folder tree, keep it simple.