diff --git a/modules/Categories/Entities/.gitkeep b/modules/Categories/Entities/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/Categories/Entities/Category.php b/modules/Categories/Entities/Category.php
new file mode 100644
index 00000000..f48fefde
--- /dev/null
+++ b/modules/Categories/Entities/Category.php
@@ -0,0 +1,23 @@
+<?php
+namespace Modules\Categories\Entities;
+
+use Franzose\ClosureTable\Models\Entity;
+
+class Category extends Entity implements CategoryInterface
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'categories';
+
+    public $timestamps = true;
+
+    /**
+     * ClosureTable model instance.
+     *
+     * @var categoryClosure
+     */
+    protected $closure = 'Modules\Categories\Entities\CategoryClosure';
+}
diff --git a/modules/Categories/Entities/CategoryClosure.php b/modules/Categories/Entities/CategoryClosure.php
new file mode 100644
index 00000000..7a030a22
--- /dev/null
+++ b/modules/Categories/Entities/CategoryClosure.php
@@ -0,0 +1,14 @@
+<?php
+namespace Modules\Categories\Entities;
+
+use Franzose\ClosureTable\Models\ClosureTable;
+
+class CategoryClosure extends ClosureTable implements CategoryClosureInterface
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'category_closure';
+}
diff --git a/modules/Categories/Entities/CategoryClosureInterface.php b/modules/Categories/Entities/CategoryClosureInterface.php
new file mode 100644
index 00000000..a82db01f
--- /dev/null
+++ b/modules/Categories/Entities/CategoryClosureInterface.php
@@ -0,0 +1,8 @@
+<?php
+namespace Modules\Categories\Entities;
+
+use Franzose\ClosureTable\Contracts\ClosureTableInterface;
+
+interface CategoryClosureInterface extends ClosureTableInterface
+{
+}
diff --git a/modules/Categories/Entities/CategoryInterface.php b/modules/Categories/Entities/CategoryInterface.php
new file mode 100644
index 00000000..b948a40d
--- /dev/null
+++ b/modules/Categories/Entities/CategoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+namespace App;namespace Modules\Categories\Entities;
+use Franzose\ClosureTable\Contracts\EntityInterface;
+
+interface CategoryInterface extends EntityInterface
+{
+}
diff --git a/modules/Categories/Handlers/Categories.php b/modules/Categories/Handlers/Categories.php
index d84886c1..67b26f04 100644
--- a/modules/Categories/Handlers/Categories.php
+++ b/modules/Categories/Handlers/Categories.php
@@ -30,8 +30,10 @@ class Categories extends BaseHandler
 
         // register links in admin menu
         $menu = \Menu::instance('mainMenu');
-//            $menu->route('content.new', trans('staticpages::adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']);
-//            $menu->route('content.overview', trans('staticpages::adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']);
+        $menu->dropdown(trans('categories::categories.name'), function ($sub) {
+            $sub->route('categories.new', trans('categories::categories.new'), [], 10, ['icon' => 'fa fa-fw fa-plus']);
+            $sub->route('categories.overview', trans('categories::categories.overview'), [], 30, ['icon' => 'fa fa-fw  fa-tags']);
+        }, 70, ['icon' => 'fa fa-fw fa-tags']);
     }
 
     /**
diff --git a/modules/Categories/Http/Controllers/.gitkeep b/modules/Categories/Http/Controllers/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/Categories/Http/Controllers/CategoriesController.php b/modules/Categories/Http/Controllers/CategoriesController.php
deleted file mode 100644
index 4bafb715..00000000
--- a/modules/Categories/Http/Controllers/CategoriesController.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php namespace Modules\Categories\Http\Controllers;
-
-use Pingpong\Modules\Routing\Controller;
-
-class CategoriesController extends Controller {
-	
-	public function index()
-	{
-		return view('categories::index');
-	}
-	
-}
\ No newline at end of file
diff --git a/modules/Categories/Http/Controllers/CreateNewCategory.php b/modules/Categories/Http/Controllers/CreateNewCategory.php
new file mode 100644
index 00000000..c81502ca
--- /dev/null
+++ b/modules/Categories/Http/Controllers/CreateNewCategory.php
@@ -0,0 +1,58 @@
+<?php namespace Modules\Categories\Http\Controllers;
+
+use App\Http\Requests\Request;
+use App\Models\Module;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Modules\Categories\Entities\Category;
+use Pingpong\Modules\Routing\Controller;
+
+class CreateNewCategory extends Controller
+{
+    /**
+     * Display form for new category
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function getNew()
+    {
+        $category = new Category();
+        $categories = Category::getTree();
+        $modules = Module::where('enabled', true)
+                         ->get();
+
+
+        return view('categories::admin.new', [
+            'category'   => $category,
+            'categories' => $categories,
+            'modules'    => $modules
+        ]);
+    }
+
+    /**
+     * Create new category
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postNew(Request $request)
+    {
+        $category = new Category();
+        $category->user_id = Auth::user()->id;
+        $category->module_id = $request->moduleId;
+        $category->name = $request->name;
+        $category->url = Str::slug($request->url);
+        $category->description = $request->description;
+
+        if ((int)$request->parentCategory) {
+            $category->parent_id = $request->parentCategory;
+        }
+
+        $category->save();
+
+        return redirect()
+            ->route('categories.overview')
+            ->with('success', trans('categories::categories.saveSuccessfull'));
+    }
+}
\ No newline at end of file
diff --git a/modules/Categories/Http/routes.php b/modules/Categories/Http/routes.php
index b50d95d9..6a7845df 100644
--- a/modules/Categories/Http/routes.php
+++ b/modules/Categories/Http/routes.php
@@ -1,6 +1,15 @@
 <?php
 
-Route::group(['middleware' => 'web', 'prefix' => 'categories', 'namespace' => 'Modules\Categories\Http\Controllers'], function()
-{
-	Route::get('/', 'CategoriesController@index');
+Route::group([
+                 'middleware' => ['web', 'auth', 'adminMenu'],
+                 'prefix'     => 'admin/categories',
+                 'namespace'  => 'Modules\Categories\Http\Controllers'
+             ], function () {
+    Route::get('/', 'CategoriesOverview@getOverview')->name('categories.overview');
+
+    Route::get('/new', 'CreateNewCategory@getNew')->name('categories.new');
+    Route::post('/new', 'CreateNewCategory@postNew')->name('categories.postNew');
+
+    Route::get('/edit/{id}', 'EditCategory@getEdit')->name('categories.edit');
+    Route::post('/edit/{id}', 'EditCategory@postEdit')->name('categories.postEdit');
 });
\ No newline at end of file
diff --git a/modules/Categories/Resources/lang/.gitkeep b/modules/Categories/Resources/lang/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/Categories/Resources/lang/en/categories.php b/modules/Categories/Resources/lang/en/categories.php
new file mode 100644
index 00000000..ac7b0f92
--- /dev/null
+++ b/modules/Categories/Resources/lang/en/categories.php
@@ -0,0 +1,7 @@
+<?php
+return [
+    'name'        => 'Categories',
+    'description' => 'Module for category management and content categorization.',
+    'new'         => 'New category',
+    'overview'    => 'All categories',
+];
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/.gitkeep b/modules/Categories/Resources/views/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/Categories/Resources/views/admin/edit.blade.php b/modules/Categories/Resources/views/admin/edit.blade.php
new file mode 100644
index 00000000..7e322823
--- /dev/null
+++ b/modules/Categories/Resources/views/admin/edit.blade.php
@@ -0,0 +1,7 @@
+@extends('admin.layout')
+
+@section('content')
+    <h2>@lang('categories::categories.edit')</h2>
+
+    @include('categories::admin.form', ['action' => route('categories.postEdit', ['id' => $category->id])])
+@endsection
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/admin/form.blade.php b/modules/Categories/Resources/views/admin/form.blade.php
new file mode 100644
index 00000000..5fa3c021
--- /dev/null
+++ b/modules/Categories/Resources/views/admin/form.blade.php
@@ -0,0 +1,46 @@
+<form action="{{$action}}" method="post">
+    {!! csrf_field() !!}
+    <div class="row">
+
+        <label>
+            @lang('categories::categories.fields.name')
+
+            <input type="text" name="name" value="{{old('name', $category->name)}}">
+        </label>
+
+        <label>
+            @lang('categories::categories.fields.url')
+
+            <input type="text" name="url" value="{{old('url', $category->url)}}">
+        </label>
+
+        <label>
+            @lang('categories::categories.fields.description')
+
+            <textarea name="description">{{old('description', $category->description)}}</textarea>
+        </label>
+
+        <label>
+            @lang('categories::categories.fields.module')
+            <select name="moduleId">
+                @foreach($modules as $module)
+                    <option @if($module->id == $category->module_id) selected
+                            @endif value="{{$module->id}}">{{trans($module->name)}}</option>
+                @endforeach
+            </select>
+        </label>
+
+        <label>
+            @lang('categories::categories.fields.parentCategory')
+            <select name="parentCategory">
+                <option value=""> ---</option>
+                @foreach($categories as $parentCategory)
+                    <option @if($parentCategory->id == $category->parent_id) selected
+                            @endif  value="{{$parentCategory->id}}">{{$parentCategory->name}}</option>
+                @endforeach
+            </select>
+        </label>
+    </div>
+
+    <button type="submit" class="button primary">@lang('categories::categories.fields.save')</button>
+</form>
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/admin/new.blade.php b/modules/Categories/Resources/views/admin/new.blade.php
new file mode 100644
index 00000000..ffe2dd7d
--- /dev/null
+++ b/modules/Categories/Resources/views/admin/new.blade.php
@@ -0,0 +1,7 @@
+@extends('admin.layout')
+
+@section('content')
+    <h2>@lang('categories::categories.new')</h2>
+
+    @include('categories::admin.form', ['action' => route('categories.postNew')])
+@endsection
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/index.blade.php b/modules/Categories/Resources/views/admin/overview.blade.php
similarity index 100%
rename from modules/Categories/Resources/views/index.blade.php
rename to modules/Categories/Resources/views/admin/overview.blade.php
diff --git a/modules/Categories/Resources/views/layouts/master.blade.php b/modules/Categories/Resources/views/layouts/master.blade.php
deleted file mode 100644
index fe1c090d..00000000
--- a/modules/Categories/Resources/views/layouts/master.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>Module Categories</title>
-	</head>
-	<body>
-		@yield('content')
-	</body>
-</html>
\ No newline at end of file