fixed if expression, moved parser main file