added filesystem stuff and layout terms