move files for refactoring
basic refactoring and start do comment