re-formatted file structure