Reorganize imports and fix the failed tests

Using relative imports for internal modules in acj package