Reusable stuff moved into Categories

Signed-off-by: Felix Gabel <felix.gabel@me.com>
Merge branch 'refs/heads/develop'