Moved tests into /tests and benches into /benches