Move some objects to sub namespaces for a better overview.
Add objects for property filtering (Just partially implemented yet)