Refactored farm into the proper package.