added package structure, TODO