Merged editor and file browser under one object, etc.