Refactor, standart pero structure
Deleted some files