Reorganized package into separated parser and tool libary