Update testcase + re-orgnize folder structure