format and organize inports
refactor move and a few changes