cleanup: add old files, remove unnecassary;