moving things around and fixing binary deployment