revamping file structure