diff --git a/src/Api.php b/src/Api.php
index 28e4aa3..c54b67e 100644
--- a/src/Api.php
+++ b/src/Api.php
@@ -321,7 +321,7 @@ private function setupResources()
 
         //Solution
         $this->solution = new Solution($this);
-        $this->folder   = new Folder($this);
+        $this->folders  = new Folder($this);
 
         //Admin
         $this->products      = new Product($this);
diff --git a/src/Resources/Folder.php b/src/Resources/Folder.php
index a371c33..02bec39 100644
--- a/src/Resources/Folder.php
+++ b/src/Resources/Folder.php
@@ -2,7 +2,7 @@
 
 namespace Freshdesk\Resources;
 
-use Freshdesk\Resources\Traits\AllTrait;
+use Freshdesk\Resources\Traits\CategoryTrait;
 use Freshdesk\Resources\Traits\DeleteTrait;
 use Freshdesk\Resources\Traits\UpdateTrait;
 use Freshdesk\Resources\Traits\ViewTrait;
@@ -17,7 +17,7 @@
 class Folder extends AbstractResource
 {
 
-    use AllTrait, ViewTrait, UpdateTrait, DeleteTrait;
+    use CategoryTrait, ViewTrait, UpdateTrait, DeleteTrait;
 
     /**
      * The resource endpoint
@@ -37,7 +37,7 @@ class Folder extends AbstractResource
     protected $categoryEndpoint = '/solutions/categories';
 
     /**
-     * Creates the category endpoint (for creating forums)
+     * Creates the category endpoint (for creating folders)
      *
      * @param integer $id
      * @return string
diff --git a/src/Resources/Traits/CategoryTrait.php b/src/Resources/Traits/CategoryTrait.php
new file mode 100644
index 0000000..88e843d
--- /dev/null
+++ b/src/Resources/Traits/CategoryTrait.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Freshdesk\Resources\Traits;
+
+/**
+ * View Trait
+ *
+ * @package Freshdesk\Resources\Traits
+ *
+ */
+trait CategoryTrait
+{
+
+    /**
+     * @return \Freshdesk\Api
+     * @internal
+     */
+    abstract protected function api();
+
+    /**
+     * View a resource
+     *
+     * Use 'include' to embed additional details in the response. Each include will consume an additional credit.
+     * For example if you embed the requester and company information you will be charged a total of 3 API credits for the call.
+     * See Freshdesk's documentation for details.
+     *
+     * @api
+     * @param int $id The resource id
+     * @param array|null $query
+     * @return array|null
+     * @throws \Freshdesk\Exceptions\AccessDeniedException
+     * @throws \Freshdesk\Exceptions\ApiException
+     * @throws \Freshdesk\Exceptions\AuthenticationException
+     * @throws \Freshdesk\Exceptions\ConflictingStateException
+     * @throws \Freshdesk\Exceptions\NotFoundException
+     * @throws \Freshdesk\Exceptions\RateLimitExceededException
+     * @throws \Freshdesk\Exceptions\UnsupportedContentTypeException
+     * @throws \Freshdesk\Exceptions\MethodNotAllowedException
+     * @throws \Freshdesk\Exceptions\UnsupportedAcceptHeaderException
+     * @throws \Freshdesk\Exceptions\ValidationException
+     */
+    public function forCategory($id, array $query = null)
+    {
+        return $this->api()->request('GET', $this->categoryEndpoint($id) . $this->endpoint, null, $query);
+    }
+}