Re-organised files to remove obsolete folder