Got rid of base directory in package