refactor of net
refactor of src
refactor of include