revamped the file structure