Moved the libraries correctly and made some minor changes to the architecture in the MethodFactory