file structure, misc changes