Source tree restructed, first test case added