remove flag
refactor classes
added test files
files description
refactor, deleted usused import and files