add file structure other minor changes