removed testsuite and moved stuff around