Split core module into persistence and analysis