Adding package and test directory