Adopt to allow debugging
Move native libs, add commits from Petes original repository