filesystem moved into main tree