Seprate files for core and libs