Changed internal package structure