Merge branch 'less-critical' into run

diff --combined src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 3ea818f,1114c42..eb2e434
--- 1/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
--- 2/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@@ -24,7 -24,12 +24,12 @@@ import java.util.logging.Logger
  
  import net.pterodactylus.sone.core.Core;
  import net.pterodactylus.sone.core.FreenetInterface;
+ import net.pterodactylus.sone.core.PostProvider;
  import net.pterodactylus.sone.core.WebOfTrustUpdater;
+ import net.pterodactylus.sone.data.PostBuilderFactory;
+ import net.pterodactylus.sone.data.PostReplyBuilderFactory;
+ import net.pterodactylus.sone.data.impl.DefaultPostBuilderFactory;
+ import net.pterodactylus.sone.data.impl.DefaultPostReplyBuilderFactory;
  import net.pterodactylus.sone.fcp.FcpInterface;
  import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
  import net.pterodactylus.sone.freenet.plugin.PluginConnector;
@@@ -207,7 -212,6 +212,7 @@@ public class SonePlugin implements Fred
  
                        @Override
                        protected void configure() {
 +                              bind(Core.class).in(Singleton.class);
                                bind(EventBus.class).toInstance(eventBus);
                                bind(Configuration.class).toInstance(startConfiguration);
                                bind(FreenetInterface.class).in(Singleton.class);
@@@ -218,6 -222,9 +223,9 @@@
                                bind(String.class).annotatedWith(Names.named("WebOfTrustContext")).toInstance("Sone");
                                bind(SonePlugin.class).toInstance(SonePlugin.this);
                                bind(FcpInterface.class).in(Singleton.class);
+                               bind(PostBuilderFactory.class).to(DefaultPostBuilderFactory.class).in(Singleton.class);
+                               bind(PostReplyBuilderFactory.class).to(DefaultPostReplyBuilderFactory.class).in(Singleton.class);
+                               bind(PostProvider.class).to(Core.class).in(Singleton.class);
                                bindListener(Matchers.any(), new TypeListener() {
  
                                        @Override