Changed to current name, deleted some useless classes