changed package structure. re factored artifacts and updated test cases
accordingly