re-doing file structure