Updated dependencies and brought files back into compilation to make testing and building easier.