changed dir layout and updated package files