src dir refactoring