Cleanup old files location, files moved to correct places