added package structure, working on router