Refactored Test folder structure