updated test folder structure to mirror src (yes like java)