refactoring files and change version