Revert "Moved some things to categories" This reverts commit 6f8528256683c64e65a22aa235c420f3a9040cd9.