Separate finance and journal into multiple modules and use API instead