Updating things to work with the new Framework structure.