Further updating folder and file structures.