updated folder structure to support test project