more changes to layout and structure of files