Core packages structure change: moved reporting inside core