Remove old files
New structure