fixing package names, imports and update code to work correctly with core module