UP: Made it so base dir is not a package