Moving Test Classes into Test folder