Trying to git rid of trunk/