moving dependencies and saner build dir structure