Refactor variables
Refactor model package
Refactor model package
Implement basic parsing commands