Relocate macfja library since it's managed in repo, not a submodule. ALso updated libs
Relocate macfja library since it's managed in repo, not a submodule. ALso updated libs