Removed legacy files;
update tests;