adjust code structrue

adjust code structrue