rough file structure changes