Fixed imports (TODO. investigate right way to import modules inside the package)