redesign and remove old files