moving tommy's stuff around for build process