Make an separate module for application core for testing purposes