moving some stuff around and using build script