Splitting the main package into 3 (core, queryapi, defaultelem)