change package name and refactory statmentparser