Revamped file structure