Rearrange package structure, add problem description in the comment