new file structure and fluid layout