CLEANUP: this isn't subversion, so why do we have a folder named "trunk"?