moving simulation classes to sub folder in test