modify the src organization so that the test could be easy to achieve.