master #1 add package structure