Reorganize packages separating parser and model