move test classes to proper place