Sort out structure more, added config and routing