Fixed import paths and the rmi dir