revamped file structure