diff --git a/README.md b/README.md
index 7e67aff..3ac62ae 100644
--- a/README.md
+++ b/README.md
@@ -4,92 +4,32 @@
 A curated list of awesome Java frameworks, libraries and software. Inspired by [awesome-python](https://github.com/vinta/awesome-python).
 
 - [Awesome Java](#awesome-java)
-    - [Admin Panels](#admin-panels)
-    - [Algorithms and Design Patterns](#algorithms-and-design-patterns)
-    - [Anti-spam](#anti-spam)
-    - [Asset Management](#asset-management)
-    - [Audio](#audio)
-    - [Authentication and OAuth](#authentication-and-oauth)
     - [Application Server](#application-server)
     - [Build Tools](#build-tools)
-    - [CMS](#cms)
-    - [CUI](#cui)
-    - [Caching](#caching)
-    - [Code Analysis and Linter](#code-analysis-and-linter)
+    - [Code Analysis](#code-analysis)
     - [Continuous Integration](#continuous-integration)
-    - [Command-line Tools](#command-line-tools)
-    - [Configuration](#configuration)
-    - [Cryptography](#cryptography)
-    - [Data Validation](#data-validation)
-    - [Data Visualization](#data-visualization)
-    - [Database](#database)
-    - [Database Drivers](#database-drivers)
     - [Date and Time](#date-and-time)
-    - [Debugging Tools](#debugging-tools)
-    - [DevOps Tools](#devops-tools)
-    - [Distribution](#distribution)
-    - [Documentation](#documentation)
-    - [Downloader](#downloader)
-    - [Editor Plugins](#editor-plugins)
-    - [Email](#email)
-    - [Environment Management](#environment-management)
-    - [Files](#files)
-    - [Foreign Function Interface](#foreign-function-interface)
-    - [Forms](#forms)
-    - [Functional Programming](#functional-programming)
-    - [GUI](#gui)
+    - [Dependency Injection](#dependency-injection)
     - [Game Development](#game-development)
-    - [Geolocation](#geolocation)
-    - [HTML Manipulation](#html-manipulation)
-    - [HTTP](#http)
-    - [Hardware](#hardware)
-    - [High Performance](#high-performance)
-    - [IDEs](#ides)
-    - [Imagery](#imagery)
-    - [Internationalization](#internationalization)
+    - [IDE](#ide)
     - [Logging](#logging)
     - [Machine Learning](#machine-learning)
     - [MapReduce](#mapreduce)
     - [Messaging](#messaging)
     - [Miscellaneous](#miscellaneous)
     - [Natural Language Processing](#natural-language-processing)
-    - [Networking](#networking)
-    - [News Feed](#news-feed)
-    - [ORM](#orm)
-    - [Package Management](#package-management)
     - [Permissions](#permissions)
-    - [Processes and Threads](#processes-and-threads)
-    - [Queue](#queue)
-    - [RESTful API](#restful-api)
-    - [Science and Data Analysis](#science-and-data-analysis)
-    - [Search](#search)
-    - [Tagging](#tagging)
     - [Template Engine](#template-engine)
     - [Testing](#testing)
-    - [Text Processing](#text-processing)
-    - [Third-party APIs](#third-party-apis)
-    - [URL Manipulation](#url-manipulation)
     - [Utility](#utility)
-    - [Video](#video)
-    - [WSGI Servers](#wsgi-servers)
-    - [Web Content Extracting](#web-content-extracting)
     - [Web Crawling](#web-crawling)
     - [Web Frameworks](#web-frameworks)
-    - [WebSocket](#websocket)
-    - [Workflow Execution](#workflow-execution)
 - [Resources](#resources)
     - [Twitter](#twitter)
     - [Websites](#websites)
-    - [Weekly](#weekly)
 - [Contributing](#contributing)
 
 # Awesome Java
-## Admin Panels
-## Algorithms and Design Patterns
-## Anti-spam
-## Asset Management
-## Audio
-## Authentication and OAuth
 
 ## Application Server
 
@@ -103,25 +43,14 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [Apache Maven](http://maven.apache.org/)
 * [Gradle](http://www.gradle.org/)
 
-## CMS
-## CUI
-## Caching
-## Code Analysis and Linter
+## Code Analysis
 
 * [SonarQube](http://www.sonarqube.org/)
 
-## Command-line Tools
-
 ## Continuous Integration
 
 * [Jenkins](http://jenkins-ci.org/)
 
-## Configuration
-## Cryptography
-## Data Validation
-## Data Visualization
-## Database
-## Database Drivers
 ## Date and Time
 
 *Libraries related to date and time.*
@@ -129,43 +58,21 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [Java 8 SE: Date and Time API](http://www.oracle.com/technetwork/articles/java/jf14-date-time-2125367.html)
 * [Joda-Time](http://joda-time.sourceforge.net/)
 
-## Debugging Tools
-
 ## Dependency Injection
 
 * [Google Guice](http://de.wikipedia.org/wiki/Google_Guice)
 
-## DevOps Tools
-## Distribution
-## Documentation
-## Downloader
-## Editor Plugins
-## Email
-## Environment Management
-## Files
-## Foreign Function Interface
-## Forms
-## Functional Programming
-## GUI
 ## Game Development
 
 * [LWJGL](http://lwjgl.org/)
 * [libGDX](http://libgdx.badlogicgames.com/)
 
-## Geolocation
-## HTML Manipulation
-## HTTP
-## Hardware
-## High Performance
-
-## IDEs
+## IDE
 
 * [NetBeans](https://netbeans.org/)
 * [Eclipse](http://www.eclipse.org/)
 * [IntelliJ](http://www.jetbrains.com/idea/)
 
-## Imagery
-## Internationalization
 ## Logging
 
 * [SLF4J](http://www.slf4j.org/) - An abstraction layer which is to be used with an implementation
@@ -184,6 +91,9 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [Apache Hadoop](http://hadoop.apache.org/)
 
 ## Messaging
+
+* [Apache ActiveMQ](http://activemq.apache.org/)
+
 ## Miscellaneous
 
 * [Lombok](http://projectlombok.org/) - Code-generator which aims to reduce the verbosity of Java
@@ -193,20 +103,10 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [Apache OpenNLP](https://opennlp.apache.org/)
 * [LingPipe](http://alias-i.com/lingpipe/)
 
-## Networking
-## News Feed
-## ORM
-## Package Management
 ## Permissions
 
 * [Apache Shiro](http://shiro.apache.org/)
 
-## Processes and Threads
-## Queue
-## RESTful API
-## Science and Data Analysis
-## Search
-## Tagging
 ## Template Engine
 
 * [Apache Tapestry](http://tapestry.apache.org/)
@@ -223,19 +123,11 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [VisualVM](http://visualvm.java.net/)
 * [Eclipse Memory Analyzer Tool](http://www.eclipse.org/mat/)
 
-## Text Processing
-## Third-party APIs
-## URL Manipulation
-
 ## Utility
 
 * [Apache Commons](http://commons.apache.org/)
 * [Google Guava](http://code.google.com/p/guava-libraries/)
 
-## Video
-## WSGI Servers
-## Web Content Extracting
-
 ## Web Crawling
 
 * [Apache Nutch](http://nutch.apache.org/)
@@ -252,9 +144,6 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 * [Apache Struts](http://struts.apache.org/)
 * [PrimeFaces](http://primefaces.org/)
 
-## WebSocket
-## Workflow Execution
-# Resources
 ## Twitter
 
 * [Adam Bien](https://twitter.com/AdamBien/)
@@ -270,8 +159,6 @@ A curated list of awesome Java frameworks, libraries and software. Inspired by [
 
 * [Java.net](http://java.net/)
 
-## Weekly
-
 # Contributing
 
 Contributions are very welcome. Just mind the general style.