Organized imports and removed use of depracted Forestry methods