refactor src and lib directory
refactor src and lib directory