Changed package structure around