Cleanup: Testing, build, directory struct