Reformatted the file structure