fixed directory/package structure to be in line with java conventions