Restucture files and delete old files